From 567a3ea42caa79ecdfcce6e9eaa2eac804d85653 Mon Sep 17 00:00:00 2001 From: Eike Rathke Date: Thu, 28 Mar 2013 01:36:40 +0100 Subject: ditched now unused comphelper::Locale Change-Id: Iddfce58d2cce01e777d51054f1a70c25ad06b15c --- comphelper/Library_comphelper.mk | 1 - comphelper/Package_inc.mk | 1 - comphelper/inc/comphelper/locale.hxx | 370 ----------------------------------- comphelper/source/misc/locale.cxx | 327 ------------------------------- 4 files changed, 699 deletions(-) delete mode 100644 comphelper/inc/comphelper/locale.hxx delete mode 100644 comphelper/source/misc/locale.cxx (limited to 'comphelper') diff --git a/comphelper/Library_comphelper.mk b/comphelper/Library_comphelper.mk index 93b0f3b48499..76e6834aca1c 100644 --- a/comphelper/Library_comphelper.mk +++ b/comphelper/Library_comphelper.mk @@ -90,7 +90,6 @@ $(eval $(call gb_Library_add_exception_objects,comphelper,\ comphelper/source/misc/instancelocker \ comphelper/source/misc/interaction \ comphelper/source/misc/listenernotification \ - comphelper/source/misc/locale \ comphelper/source/misc/logging \ comphelper/source/misc/mediadescriptor \ comphelper/source/misc/mimeconfighelper \ diff --git a/comphelper/Package_inc.mk b/comphelper/Package_inc.mk index 35552f6d58fc..f03f56d60ce6 100644 --- a/comphelper/Package_inc.mk +++ b/comphelper/Package_inc.mk @@ -72,7 +72,6 @@ $(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/streamsection.hx $(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/accessibletexthelper.hxx,comphelper/accessibletexthelper.hxx)) $(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/accessibleselectionhelper.hxx,comphelper/accessibleselectionhelper.hxx)) $(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/serviceinfohelper.hxx,comphelper/serviceinfohelper.hxx)) -$(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/locale.hxx,comphelper/locale.hxx)) $(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/numberedcollection.hxx,comphelper/numberedcollection.hxx)) $(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/ChainablePropertySet.hxx,comphelper/ChainablePropertySet.hxx)) $(eval $(call gb_Package_add_file,comphelper_inc,inc/comphelper/stl_types.hxx,comphelper/stl_types.hxx)) diff --git a/comphelper/inc/comphelper/locale.hxx b/comphelper/inc/comphelper/locale.hxx deleted file mode 100644 index 418fff34ffe2..000000000000 --- a/comphelper/inc/comphelper/locale.hxx +++ /dev/null @@ -1,370 +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 _COMPHELPER_LOCALE_HXX_ -#define _COMPHELPER_LOCALE_HXX_ - -#include -#include -#include "comphelper/comphelperdllapi.h" - -namespace comphelper{ - -/** @short A Locale object represents a specific geographical, political, or cultural region. - - @descr This Locale class can be used to: - - provide the different parts of a Locale (Language, Country, Variant) - - converting it from/to ISO formated string values (like e.g. "en-US") - - provide some predefined (static) Locale objects - */ -class COMPHELPER_DLLPUBLIC Locale -{ - public: - - /** @short seperates LANGUAGE and COUNTRY part of an ISO formated Locale. */ - static const sal_Unicode SEPERATOR_LC; - - /** @short seperates COUNTRY and VARIANT part of an ISO formated Locale. */ - static const sal_Unicode SEPERATOR_CV; - - /** @short seperates COUNTRY and VARIANT part of an ISO formated Locale. - @descr Its true for some linux derivates only :-( */ - static const sal_Unicode SEPERATOR_CV_LINUX; - - /** @short some predefined Locale objects. */ - static const Locale EN_US(); - static const Locale X_DEFAULT(); - static const Locale X_NOTRANSLATE(); - - //------------------------------------------- - // types - - public: - - /** @short will be throw during convertion, if a Locale cant be interpreted. */ - struct MalFormedLocaleException - { - public: - ::rtl::OUString Message; - - MalFormedLocaleException() - {} - - MalFormedLocaleException(const ::rtl::OUString& sMessage) - : Message(sMessage) - {} - }; - - //------------------------------------------- - // member - - private : - - //--------------------------------------- - /** @short must be a valid ISO Language Code. - - @descr These codes are the lower-case two-letter codes as defined by ISO-639. - You can find a full list of these codes at a number of sites, such as: -
- http://www.ics.uci.edu/pub/ietf/http/related/iso639.txt - */ - ::rtl::OUString m_sLanguage; - - //--------------------------------------- - /** @short must be a valid ISO Country Code. - @descr These codes are the upper-case two-letter codes as defined by ISO-3166. - You can find a full list of these codes at a number of sites, such as: -
- http://www.chemie.fu-berlin.de/diverse/doc/ISO_3166.html - */ - ::rtl::OUString m_sCountry; - - //--------------------------------------- - /** @short Variant codes are vendor and browser-specific. - @descr For example, use WIN for Windows, MAC for Macintosh, and POSIX for POSIX. - Where there are two variants, separate them with an underscore, and - put the most important one first. For example, a Traditional Spanish collation - might be referenced, with "ES", "ES", "Traditional_WIN". - */ - ::rtl::OUString m_sVariant; - - //------------------------------------------- - // interface - - public : - - //--------------------------------------- - /** @short needed by outside users! - - @descr Otherwise it wouldnt be possible to use - any instance of such Locale static ... - */ - Locale(); - - //--------------------------------------- - /** @short construct a Locale from an ISO formated string value. - - @seealso fromISO() - - @param sISO - an ISO formated string value, which can be parsed and - tokenized into a Lamnguage, Country and Variant part. - - @throw MalFormedLocaleException - if conversion failed. - */ - Locale(const ::rtl::OUString& sISO) - throw(MalFormedLocaleException); - - //--------------------------------------- - /** @short construct a Locale from language, country and variant. - - @seealso setLanguage() - @seealso setCountry() - @seealso setVariant() - - @param sLanguage - lowercase two-letter ISO-639 code. - - @param sCountry - uppercase two-letter ISO-3166 code. - - @param sVariant - vendor and browser specific code. - */ - Locale(const ::rtl::OUString& sLanguage , - const ::rtl::OUString& sCountry , - const ::rtl::OUString& sVariant = ::rtl::OUString()); - - //--------------------------------------- - /** @short copy constructor. - - @param aCopy - the copy object. - */ - Locale(const Locale& aCopy); - - //--------------------------------------- - /** @short returns the language code for this locale. - - @descr That will either be the empty string or - a lowercase ISO 639 code. - - @return [string] - the language code. - */ - ::rtl::OUString getLanguage() const; - - //--------------------------------------- - /** @short returns the country/region code for this locale. - - @descr That will either be the empty string or an - upercase ISO 3166 2-letter code. - - @return [string] - the country code. - */ - ::rtl::OUString getCountry() const; - - //--------------------------------------- - /** @short returns the variant code for this locale. - - @return [string] - the variant code. - */ - ::rtl::OUString getVariant() const; - - //--------------------------------------- - /** @short set the new language code for this locale. - - @descr That will either be the empty string or - a lowercase ISO 639 code. - - @param sLanguage - the language code. - */ - void setLanguage(const ::rtl::OUString& sLanguage); - - //--------------------------------------- - /** @short set the new country/region code for this locale. - - @descr That will either be the empty string or an - upercase ISO 3166 2-letter code. - - @param sCountry - the country code. - */ - void setCountry(const ::rtl::OUString& sCountry); - - //--------------------------------------- - /** @short set the new variant code for this locale. - - @param sVariant - the variant code. - */ - void setVariant(const ::rtl::OUString& sVariant); - - //--------------------------------------- - /** @short take over new Locale information. - - @seealso Locale(const ::rtl::OUString& sISO) - - @param sISO - an ISO formated string value, which can be parsed and - tokenized into a Lamnguage, Country and Variant part. - e.g. "en-US" or "en-US_WIN" - - @throw MalFormedLocaleException - if conversion failed. - */ - void fromISO(const ::rtl::OUString& sISO) - throw(MalFormedLocaleException); - - //--------------------------------------- - /** @short converts this Locale to an ISO formated string value. - - @descr The different parts of this Locale will be assempled - e.g. to "en-US" or "en-US_WIN" - - @return [string] - the ISO formated string. - */ - ::rtl::OUString toISO() const; - - //--------------------------------------- - /** @short check, if two Locale objects are equals. - - @descr All parts of a Locale (means Language, Country and Variant) - will be checked. - - @param aComparable - the Locale object for compare. - - @return [boolean] - TRUE if both objects uses the same values for - Language, Country and Variant. - */ - sal_Bool equals(const Locale& aComparable) const; - - //--------------------------------------- - /** @short check, if two Locale objects - uses the same language. - - @descr The Country and Variant parts of a Locale - wont be checked here. - - @return [boolean] - TRUE if both objects uses the same - Language value. - */ - sal_Bool similar(const Locale& aComparable) const; - - //--------------------------------------- - /** @short search for an equal or at least for a similar - Locale in a list of possible ones. - - @descr First it searches for a Locale, which is equals - to the reference Locale. - (means: same Language, Country, Variant) - - If the reference Locale couldnt be located, it will - tried again - but we are checking for "similar" Locales then. - (means: same Language) - - If no similar Locale could be located, we search - for a Locale "en-US" inside the given Locale list. - - If "en-US" could not be located, we search for - a Locale "en" inside the given list. - - If no "same" nor any "similar" locale could be found, - we try "x-default" and "x-notranslate" explicitly. - Sometimes localized variables are optimized and doesnt use - localzation realy. E.g. in case the localized value is a fix - product name. - - If no locale match till now, we use any other existing - locale, which exists inside the set of given ones! - - @seealso equals() - @seealso similar() - - @param lISOList - the list of possible Locales - (as formated ISO strings). - - @param sReferenceISO - the reference Locale, which should be searched - if its equals or similar to any Locale inside - the provided Locale list. - - @return An iterator, which points to the found element - inside the given Locale list. - If no matching Locale could be found, it points - to the end of the list. - - @throw [MalFormedLocaleException] - if at least one ISO formated string couldnt - be converted to a valid Locale Object. - */ - static ::std::vector< ::rtl::OUString >::const_iterator getFallback(const ::std::vector< ::rtl::OUString >& lISOList , - const ::rtl::OUString& sReferenceISO) - throw(MalFormedLocaleException); - - //--------------------------------------- - /** @short assign elements of another locale - to this instance. - - @param rCopy - another locale object. - */ - void operator=(const Locale& rCopy); - - //--------------------------------------- - /** @short check if two Locale objects are equals. - - @seealso equals() - - @param aComparable - the Locale object for compare. - - @return [boolean] - TRUE if both objects uses the same values for - Language, Country and Variant. - */ - sal_Bool operator==(const Locale& aComparable) const; - - //--------------------------------------- - /** @short check if two Locale objects are different. - - @param aComparable - the Locale object for compare. - - @return [boolean] - TRUE if at least one part of such Locale - isnt the same. - */ - sal_Bool operator!=(const Locale& aComparable) const; -}; - -} // namespace salhelper - -#endif // _COMPHELPER_LOCALE_HXX_ - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/comphelper/source/misc/locale.cxx b/comphelper/source/misc/locale.cxx deleted file mode 100644 index d1d528c4d6a7..000000000000 --- a/comphelper/source/misc/locale.cxx +++ /dev/null @@ -1,327 +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 - -#include - - -namespace comphelper{ - -//----------------------------------------------- -const sal_Unicode Locale::SEPERATOR_LC = (sal_Unicode)'-'; -const sal_Unicode Locale::SEPERATOR_CV = (sal_Unicode)'_'; -const sal_Unicode Locale::SEPERATOR_CV_LINUX = (sal_Unicode)'.'; - -//----------------------------------------------- -const Locale Locale::X_DEFAULT() -{ - return Locale(::rtl::OUString("x"), ::rtl::OUString("default")); -} - -//----------------------------------------------- -const Locale Locale::EN_US() -{ - return Locale(::rtl::OUString("en"), ::rtl::OUString("US")); -} - -//----------------------------------------------- -const Locale Locale::X_NOTRANSLATE() -{ - return Locale(::rtl::OUString("x"), ::rtl::OUString("notranslate")); -} - -//----------------------------------------------- -Locale::Locale(const ::rtl::OUString& sISO) - throw(Locale::MalFormedLocaleException) -{ - fromISO(sISO); -} - -//----------------------------------------------- -Locale::Locale(const ::rtl::OUString& sLanguage, - const ::rtl::OUString& sCountry , - const ::rtl::OUString& sVariant ) -{ - // Use set methods to check values too! - setLanguage(sLanguage); - setCountry (sCountry ); - setVariant (sVariant ); -} - -//----------------------------------------------- -Locale::Locale() -{ - // Initialize instance ... otherwise user will - // may be get exceptions if he e.g. copy this instance ... - (*this) = X_NOTRANSLATE(); -} - -//----------------------------------------------- -Locale::Locale(const Locale& aCopy) -{ - (*this) = aCopy; // recycle assign operator -} - -//----------------------------------------------- -::rtl::OUString Locale::getLanguage() const -{ - return m_sLanguage; -} - -//----------------------------------------------- -::rtl::OUString Locale::getCountry() const -{ - return m_sCountry; -} - -//----------------------------------------------- -::rtl::OUString Locale::getVariant() const -{ - return m_sVariant; -} - -//----------------------------------------------- -void Locale::setLanguage(const ::rtl::OUString& sLanguage) -{ - m_sLanguage = sLanguage; -} - -//----------------------------------------------- -void Locale::setCountry(const ::rtl::OUString& sCountry) -{ - m_sCountry = sCountry; -} - -//----------------------------------------------- -void Locale::setVariant(const ::rtl::OUString& sVariant) -{ - m_sVariant = sVariant; -} - -//----------------------------------------------- -/* Attention: Use own interface methods to set the - different parts of this locale. Because the - check the incoming value and throw an exception - automaticly ... - */ -void Locale::fromISO(const ::rtl::OUString& sISO) - throw(Locale::MalFormedLocaleException) -{ - m_sLanguage = ""; - m_sCountry = ""; - m_sVariant = ""; - - ::rtl::OUString sParser(sISO); - sParser = sParser.trim(); - - sal_Int32 nStart = 0; - sal_Int32 nEnd = 0; - - // extract language part - nEnd = sParser.indexOf(SEPERATOR_LC, nStart); - if (nEnd<0) - { - setLanguage(sParser); - return; - } - setLanguage(sParser.copy(nStart, nEnd-nStart)); - nStart = nEnd+1; - - // extract country - nEnd = sParser.indexOf(SEPERATOR_CV, nStart); - if (nEnd<0) - nEnd = sParser.indexOf(SEPERATOR_CV_LINUX, nStart); - if (nEnd<0) - { - setCountry(sParser.copy(nStart, sParser.getLength()-nStart)); - return; - } - nStart = nEnd+1; - - // extract variant - setVariant(sParser.copy(nStart, sParser.getLength()-nStart)); -} - -//----------------------------------------------- -::rtl::OUString Locale::toISO() const -{ - ::rtl::OUStringBuffer sISO(64); - - sISO.append(m_sLanguage); - if (!m_sCountry.isEmpty()) - { - sISO.append(SEPERATOR_LC); - sISO.append(m_sCountry); - - if (!m_sVariant.isEmpty()) - { - sISO.append(SEPERATOR_CV); - sISO.append(m_sVariant); - } - } - - return sISO.makeStringAndClear(); -} - -//----------------------------------------------- -sal_Bool Locale::equals(const Locale& aComparable) const -{ - return ( - m_sLanguage.equals(aComparable.m_sLanguage) && - m_sCountry.equals (aComparable.m_sCountry ) && - m_sVariant.equals (aComparable.m_sVariant ) - ); -} - -//----------------------------------------------- -sal_Bool Locale::similar(const Locale& aComparable) const -{ - return (m_sLanguage.equals(aComparable.m_sLanguage)); -} - -//----------------------------------------------- -::std::vector< ::rtl::OUString >::const_iterator Locale::getFallback(const ::std::vector< ::rtl::OUString >& lISOList , - const ::rtl::OUString& sReferenceISO) - throw(Locale::MalFormedLocaleException) -{ - Locale aReference(sReferenceISO); - - // Note: The same language or "en"/"en-US" should be preferred as fallback. - // On the other side some localized variables doesnt use localzation in real. - // May be the use a "fix" value only ... marked as X-DEFAULT or X-NOTRANSLATE. - // At least it can be discussed, if any language is a valid fallback ... - // But in case some office functionality depends on that (that means real functionality instead - // of pure UI descriptions) we should do anything, so it can work. - - ::std::vector< ::rtl::OUString >::const_iterator pSimilar = lISOList.end(); - ::std::vector< ::rtl::OUString >::const_iterator pEN_US = lISOList.end(); - ::std::vector< ::rtl::OUString >::const_iterator pEN = lISOList.end(); - ::std::vector< ::rtl::OUString >::const_iterator pXDefault = lISOList.end(); - ::std::vector< ::rtl::OUString >::const_iterator pXNoTranslate = lISOList.end(); - ::std::vector< ::rtl::OUString >::const_iterator pAny = lISOList.end(); - - ::std::vector< ::rtl::OUString >::const_iterator pIt; - for ( pIt = lISOList.begin(); - pIt != lISOList.end() ; - ++pIt ) - { - Locale aCheck(*pIt); - // found Locale, which match with 100% => return it - if (aCheck.equals(aReference)) - return pIt; - - // found similar Locale => safe it as possible fallback - if ( - (pSimilar == lISOList.end()) && - (aCheck.similar(aReference)) - ) - { - pSimilar = pIt; - } - else - // found en-US => safe it as fallback - if ( - (pEN_US == lISOList.end()) && - (aCheck.equals(EN_US()) ) - ) - { - pEN_US = pIt; - } - else - // found en[-XX] => safe it as fallback - if ( - (pEN == lISOList.end() ) && - (aCheck.similar(EN_US())) - ) - { - pEN = pIt; - } - else - // found an explicit default value(!) => safe it as fallback - if ( - (pXDefault == lISOList.end()) && - (aCheck.equals(X_DEFAULT()) ) - ) - { - pXDefault = pIt; - } - else - // found an implicit default value(!) => safe it as fallback - if ( - (pXNoTranslate == lISOList.end()) && - (aCheck.equals(X_NOTRANSLATE()) ) - ) - { - pXNoTranslate = pIt; - } - else - // safe the first locale, which isn't an explicit fallback - // as "last possible fallback" - if (pAny == lISOList.end()) - pAny = pIt; - } - - if (pSimilar != lISOList.end()) - return pSimilar; - - if (pEN_US != lISOList.end()) - return pEN_US; - - if (pEN != lISOList.end()) - return pEN; - - if (pXDefault != lISOList.end()) - return pXDefault; - - if (pXNoTranslate != lISOList.end()) - return pXNoTranslate; - - if (pAny != lISOList.end()) - return pAny; - - return lISOList.end(); -} - -//----------------------------------------------- -void Locale::operator=(const Locale& rCopy) -{ - // Take over these values without checking ... - // They was already checked if the copy was constructed - // and must be valid now! - m_sLanguage = rCopy.m_sLanguage; - m_sCountry = rCopy.m_sCountry; - m_sVariant = rCopy.m_sVariant; -} - -//----------------------------------------------- -sal_Bool Locale::operator==(const Locale& aComparable) const -{ - return equals(aComparable); -} - -//----------------------------------------------- -sal_Bool Locale::operator!=(const Locale& aComparable) const -{ - return !equals(aComparable); -} - -} // namespace comphelper - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- cgit e-3-5-2 LibreOffice 核心代码仓库文档基金会
summaryrefslogtreecommitdiff
path: root/android/mobile-config.py
AgeCommit message (Expand)Author