diff options
author | Khaled Hosny <khaledhosny@eglug.org> | 2016-12-02 05:45:58 +0200 |
---|---|---|
committer | Khaled Hosny <khaledhosny@eglug.org> | 2016-12-02 17:11:43 +0000 |
commit | 5d7a1ddf36eb0774a3d11e9c0dba59562d3e0c11 (patch) | |
tree | 42ce6f7ee121395f1ed981858c7a9308b4cc3fc1 /include | |
parent | 1f8a70262ad99668210d9d6a128efd8382f63dd5 (diff) |
Simplify FontManager a bit
There does not seem to be any need for that atom thing as we are
perfectly happy using plain OUStrings in the same struct, not to mention
that font names are supposed to be unique so I don’t see what we are
saving here.
As this was the only use for unotools/atom, it goes with it.
Change-Id: If9d58d84fff0403f9b2c41fe594b99028b30c2f4
Reviewed-on: https://gerrit.libreoffice.org/31520
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Khaled Hosny <khaledhosny@eglug.org>
Diffstat (limited to 'include')
-rw-r--r-- | include/unotools/atom.hxx | 62 |
1 files changed, 0 insertions, 62 deletions
diff --git a/include/unotools/atom.hxx b/include/unotools/atom.hxx deleted file mode 100644 index c91dc87208d7..000000000000 --- a/include/unotools/atom.hxx +++ /dev/null @@ -1,62 +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_UNOTOOLS_ATOM_HXX -#define INCLUDED_UNOTOOLS_ATOM_HXX - -#include <unotools/unotoolsdllapi.h> -#include <rtl/ustring.hxx> -#include <osl/mutex.hxx> -#include <com/sun/star/util/XAtomServer.hpp> -#include <cppuhelper/implbase1.hxx> -#include <list> -#include <unordered_map> - -#define INVALID_ATOM 0 - -namespace utl { - - class AtomProvider - { - int m_nAtoms; - std::unordered_map<int, OUString> m_aStringMap; - std::unordered_map<OUString, int, OUStringHash> m_aAtomMap; - public: - AtomProvider(); - ~AtomProvider(); - - int getAtom( const OUString& ); - const OUString& getString( int ) const; - }; - - class UNOTOOLS_DLLPUBLIC MultiAtomProvider - { - std::unordered_map<int, AtomProvider*> m_aAtomLists; - public: - MultiAtomProvider(); - ~MultiAtomProvider(); - - int getAtom( int atomClass, const OUString& rString ); - - const OUString& getString( int atomClass, int atom ) const; - }; -} - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |