From 883c7fe1b50fe85c2a2026e0b098be0d57ec19a2 Mon Sep 17 00:00:00 2001 From: Michael Weghorn Date: Sat, 20 Dec 2025 22:42:49 +0100 Subject: [PATCH] tdf#168594 Move CharAndFont to charmapcontainer.hxx This was only in include/sfx2/charwin.hxx because it was used by SvxCharView also defined in that file before that one was dropped in previous commit Change-Id: Id6407b1c4b154bc7004723a0534141107a6939d4 Author: Michael Weghorn Date: Sat Dec 20 22:25:15 2025 +0100 tdf#168594 tdf#119931 a11y special chars: Use IconView for recent/favorites Move it to the same header as the SfxCharmapContainer class where this is mainly used and drop the obsolete charwin.hxx. Change-Id: I5e31764d4a0d5bbed6f387b5b44bd93002b1b705 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/196036 Tested-by: Jenkins Reviewed-by: Michael Weghorn --- include/sfx2/charmapcontainer.hxx | 15 +++++++++++- include/sfx2/charwin.hxx | 38 ------------------------------- 2 files changed, 14 insertions(+), 39 deletions(-) delete mode 100644 include/sfx2/charwin.hxx diff --git a/include/sfx2/charmapcontainer.hxx b/include/sfx2/charmapcontainer.hxx index 02a9e6104492..00aaf7f16b77 100644 --- a/include/sfx2/charmapcontainer.hxx +++ b/include/sfx2/charmapcontainer.hxx @@ -19,7 +19,6 @@ #pragma once -#include #include #include #include @@ -27,6 +26,20 @@ #include #include +struct CharAndFont +{ + OUString sChar; + OUString sFont; + + CharAndFont(const OUString& rChar, const OUString& rFont) + : sChar(rChar) + , sFont(rFont) + { + } + + bool operator==(const CharAndFont& rOther) const = default; +}; + class SFX2_DLLPUBLIC SfxCharmapContainer { std::deque m_aRecentChars; diff --git a/include/sfx2/charwin.hxx b/include/sfx2/charwin.hxx deleted file mode 100644 index 60daa52940e9..000000000000 --- a/include/sfx2/charwin.hxx +++ /dev/null @@ -1,38 +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 . - */ - -#pragma once - -#include - -struct CharAndFont -{ - OUString sChar; - OUString sFont; - - CharAndFont(const OUString& rChar, const OUString& rFont) - : sChar(rChar) - , sFont(rFont) - { - } - - bool operator==(const CharAndFont& rOther) const = default; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */