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: */