compilerplugins/clang/constantparam.booleans.results | 4
solenv/clang-format/excludelist | 2
vcl/Library_vcl.mk | 1
vcl/source/fontsubset/list.cxx | 229 -------------------
vcl/source/fontsubset/list.h | 89 -------
5 files changed, 325 deletions(-)
New commits:
commit 1cfa1e7a0976dce86a8b4168119c9c6f015ff5ce
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Thu Sep 22 15:32:36 2022 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Fri Sep 23 12:55:11 2022 +0200
remove some dead code
after
commit 590796ca0866168e3129d2abd0a0197114cddcdc
Author: Noel Grandin <noelgran...@gmail.com>
Date: Wed Sep 21 20:44:42 2022 +0200
convert TrueTypeTable to C++ class
Change-Id: I5c656011ebe37529788cea6a749c07ada2378385
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140433
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/compilerplugins/clang/constantparam.booleans.results
b/compilerplugins/clang/constantparam.booleans.results
index e34c49f419b8..8f04e67d03ec 100644
--- a/compilerplugins/clang/constantparam.booleans.results
+++ b/compilerplugins/clang/constantparam.booleans.results
@@ -4178,10 +4178,6 @@ vcl/source/filter/wmf/wmfwr.hxx:162
void WMFWriter::WMFRecord_SetBkMode(_Bool)
_Bool bTransparent
1
-vcl/source/fontsubset/list.h:64
- int listSkipForward(struct list_ *,int)
- int n
- 1
vcl/source/gdi/FileDefinitionWidgetDraw.cxx:102
_Bool getSettingValueBool(class std::basic_string_view<char, struct
std::char_traits<char> >,_Bool)
_Bool bDefault
diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist
index 3ad66572897a..9efe16dda8d8 100644
--- a/solenv/clang-format/excludelist
+++ b/solenv/clang-format/excludelist
@@ -14819,8 +14819,6 @@ vcl/source/font/fontcharmap.cxx
vcl/source/font/fontmetric.cxx
vcl/source/fontsubset/cff.cxx
vcl/source/fontsubset/fontsubset.cxx
-vcl/source/fontsubset/list.cxx
-vcl/source/fontsubset/list.h
vcl/source/fontsubset/sft.cxx
vcl/source/fontsubset/ttcr.cxx
vcl/source/fontsubset/ttcr.hxx
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 2b12fabe987b..a432ceb09146 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -493,7 +493,6 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
vcl/source/font/font \
vcl/source/fontsubset/cff \
vcl/source/fontsubset/fontsubset \
- vcl/source/fontsubset/list \
vcl/source/fontsubset/sft \
vcl/source/fontsubset/ttcr \
vcl/source/fontsubset/xlat \
diff --git a/vcl/source/fontsubset/list.cxx b/vcl/source/fontsubset/list.cxx
deleted file mode 100644
index aca585678e9c..000000000000
--- a/vcl/source/fontsubset/list.cxx
+++ /dev/null
@@ -1,229 +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 .
- */
-
-/*[]---------------------------------------------------[]*/
-/*| |*/
-/*| list.c - bidirectional list class |*/
-/*| |*/
-/*| |*/
-/*| Author: Alexander Gelfenbain |*/
-/*[]---------------------------------------------------[]*/
-
-#include <assert.h>
-#include <cstdlib>
-
-#include "list.h"
-
-namespace {
-
-/*- private data types */
-struct lnode {
- struct lnode *next;
- struct lnode *prev;
-
- void *value;
-
-};
-
-}
-
-struct list_ {
- lnode *head, *tail, *cptr;
- size_t aCount;
- list_destructor eDtor;
-};
-
-/*- private methods */
-
-static lnode *newNode(void *el)
-{
- lnode *ptr = static_cast<lnode *>(std::malloc(sizeof(lnode)));
- assert(ptr != nullptr);
-
- ptr->value = el;
-
- return ptr;
-}
-
-static lnode *appendPrim(list pThis, void *el)
-{
- lnode *ptr = newNode(el);
- lnode **flink, *blink;
-
- if (pThis->tail != nullptr) {
- flink = &(pThis->tail->next);
- blink = pThis->tail;
- } else {
- flink = &pThis->head;
- blink = nullptr;
- pThis->cptr = ptr; /*- list was empty - set
current to this element */
- }
-
- *flink = ptr;
- pThis->tail = ptr;
-
- ptr->prev = blink;
- ptr->next = nullptr;
-
- pThis->aCount++;
- return ptr;
-}
-
-/*- public methods */
-list listNewEmpty() /*- default ctor */
-{
- list pThis = static_cast<list>(std::malloc(sizeof(struct list_)));
- assert(pThis != nullptr);
-
- pThis->aCount = 0;
- pThis->eDtor = nullptr;
- pThis->head = pThis->tail = pThis->cptr = nullptr;
-
- return pThis;
-}
-
-void listDispose(list pThis) /*- dtor */
-{
- assert(pThis != nullptr);
- listClear(pThis);
- std::free(pThis);
-}
-
-void listSetElementDtor(list pThis, list_destructor f)
-{
- assert(pThis != nullptr);
- pThis->eDtor = f;
-}
-
-/* calling this function on an empty list is a run-time error */
-void *listCurrent(list pThis)
-{
- assert(pThis != nullptr);
- assert(pThis->cptr != nullptr);
- return pThis->cptr->value;
-}
-
-int listCount(list pThis)
-{
- assert(pThis != nullptr);
- return pThis->aCount;
-}
-
-int listIsEmpty(list pThis)
-{
- assert(pThis != nullptr);
- return pThis->aCount == 0;
-}
-
-int listNext(list pThis)
-{
- return listSkipForward(pThis, 1);
-}
-
-int listSkipForward(list pThis, int n)
-{
- int m = 0;
- assert(pThis != nullptr);
-
- if (pThis->cptr == nullptr) return 0;
-
- while (n != 0) {
- if (pThis->cptr->next == nullptr) break;
- pThis->cptr = pThis->cptr->next;
- n--;
- m++;
- }
- return m;
-}
-
-int listToFirst(list pThis)
-{
- assert(pThis != nullptr);
-
- if (pThis->cptr != pThis->head) {
- pThis->cptr = pThis->head;
- return 1;
- }
- return 0;
-}
-
-int listToLast(list pThis)
-{
- assert(pThis != nullptr);
-
- if (pThis->cptr != pThis->tail) {
- pThis->cptr = pThis->tail;
- return 1;
- }
- return 0;
-}
-
-list listAppend(list pThis, void *el)
-{
- assert(pThis != nullptr);
-
- appendPrim(pThis, el);
- return pThis;
-}
-
-list listRemove(list pThis)
-{
- lnode *ptr = nullptr;
- if (pThis->cptr == nullptr) return pThis;
-
- if (pThis->cptr->next != nullptr) {
- ptr = pThis->cptr->next;
- pThis->cptr->next->prev = pThis->cptr->prev;
- } else {
- pThis->tail = pThis->cptr->prev;
- }
-
- if (pThis->cptr->prev != nullptr) {
- if (ptr == nullptr) ptr = pThis->cptr->prev;
- pThis->cptr->prev->next = pThis->cptr->next;
- } else {
- pThis->head = pThis->cptr->next;
- }
-
- if (pThis->eDtor) pThis->eDtor(pThis->cptr->value); /* call the
dtor callback */
-
- std::free(pThis->cptr);
- pThis->aCount--;
- pThis->cptr = ptr;
- return pThis;
-}
-
-list listClear(list pThis)
-{
- lnode *node = pThis->head, *ptr;
-
- while (node) {
- ptr = node->next;
- if (pThis->eDtor) pThis->eDtor(node->value); /* call the
dtor callback */
- std::free(node);
- pThis->aCount--;
- node = ptr;
- }
-
- pThis->head = pThis->tail = pThis->cptr = nullptr;
- assert(pThis->aCount == 0);
- return pThis;
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/fontsubset/list.h b/vcl/source/fontsubset/list.h
deleted file mode 100644
index 18fda151a472..000000000000
--- a/vcl/source/fontsubset/list.h
+++ /dev/null
@@ -1,89 +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 .
- */
-
-/*[]---------------------------------------------------[]*/
-/*| |*/
-/*| Implementation of the list data type |*/
-/*| |*/
-/*| |*/
-/*| Author: Alexander Gelfenbain |*/
-/*[]---------------------------------------------------[]*/
-
-#ifndef INCLUDED_VCL_INC_LIST_H
-#define INCLUDED_VCL_INC_LIST_H
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-/*
- * List of void * pointers
- */
-
- typedef struct list_ *list;
- typedef void (*list_destructor)(void *);
-
-/*- constructors and a destructor */
- list listNewEmpty(void);
-#ifdef TEST
- list listNewCopy(list);
-#endif
- void listDispose(list);
- void listSetElementDtor(list, list_destructor); /*-
this function will be executed when the element is removed via listRemove() or
listClear() */
-
-/*- queries */
- void * listCurrent(list);
- int listCount(list);
- int listIsEmpty(list);
-#ifdef TEST
- int listAtFirst(list);
- int listAtLast(list);
- int listPosition(list); /* Expensive! */
-#endif
-
-/*- positioning functions */
-/*- return the number of elements by which the current position in the list
changes */
- int listNext(list);
- int listSkipForward(list, int n);
- int listToFirst(list);
- int listToLast(list);
-
-/*- adding and removing elements */
- list listAppend(list, void *);
-#ifdef TEST
- list listPrepend(list, void *);
- list listInsertAfter(list, void *);
- list listInsertBefore(list, void *);
-#endif
- list listRemove(list); /* removes the current
element */
- list listClear(list); /* removes all elements
*/
-
-#ifdef TEST
-/*- forall */
- void listForAll(list, void (*f)(void *));
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif // INCLUDED_VCL_INC_LIST_H
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
