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 /unotools | |
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 'unotools')
-rw-r--r-- | unotools/Library_utl.mk | 1 | ||||
-rw-r--r-- | unotools/source/misc/atom.cxx | 87 |
2 files changed, 0 insertions, 88 deletions
diff --git a/unotools/Library_utl.mk b/unotools/Library_utl.mk index 237a1888154d..75a40298fdd3 100644 --- a/unotools/Library_utl.mk +++ b/unotools/Library_utl.mk @@ -90,7 +90,6 @@ $(eval $(call gb_Library_add_exception_objects,utl,\ unotools/source/i18n/readwritemutexguard \ unotools/source/i18n/textsearch \ unotools/source/i18n/transliterationwrapper \ - unotools/source/misc/atom \ unotools/source/misc/closeveto \ unotools/source/misc/componentresmodule \ unotools/source/misc/datetime \ diff --git a/unotools/source/misc/atom.cxx b/unotools/source/misc/atom.cxx deleted file mode 100644 index 84c2de04bbf5..000000000000 --- a/unotools/source/misc/atom.cxx +++ /dev/null @@ -1,87 +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 . - */ - -#include <unotools/atom.hxx> - -using namespace utl; -using namespace ::com::sun::star::uno; -using namespace ::com::sun::star::util; - -AtomProvider::AtomProvider() -{ - m_nAtoms = 1; -} - -AtomProvider::~AtomProvider() -{ -} - -int AtomProvider::getAtom( const OUString& rString ) -{ - std::unordered_map< OUString, int, OUStringHash >::iterator it = m_aAtomMap.find( rString ); - if( it != m_aAtomMap.end() ) - return it->second; - m_aAtomMap[ rString ] = m_nAtoms; - m_aStringMap[ m_nAtoms ] = rString; - m_nAtoms++; - return m_nAtoms-1; -} - -const OUString& AtomProvider::getString( int nAtom ) const -{ - static OUString aEmpty; - std::unordered_map<int, OUString>::const_iterator it = m_aStringMap.find( nAtom ); - - return it == m_aStringMap.end() ? aEmpty : it->second; -} - -MultiAtomProvider::MultiAtomProvider() -{ -} - -MultiAtomProvider::~MultiAtomProvider() -{ - for( std::unordered_map<int, AtomProvider*>::iterator it = m_aAtomLists.begin(); it != m_aAtomLists.end(); ++it ) - delete it->second; -} - -int MultiAtomProvider::getAtom( int atomClass, const OUString& rString ) -{ - std::unordered_map<int, AtomProvider*>::iterator it = - m_aAtomLists.find( atomClass ); - if( it != m_aAtomLists.end() ) - return it->second->getAtom( rString ); - - AtomProvider* pNewClass; - m_aAtomLists[ atomClass ] = pNewClass = new AtomProvider(); - return pNewClass->getAtom( rString ); -} - -const OUString& MultiAtomProvider::getString( int atomClass, int atom ) const -{ - std::unordered_map<int, AtomProvider*>::const_iterator it = - m_aAtomLists.find( atomClass ); - if( it != m_aAtomLists.end() ) - return it->second->getString( atom ); - - static OUString aEmpty; - return aEmpty; -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |