[Libreoffice-commits] core.git: framework/source odk/examples offapi/com
Caolán McNamara
caolanm at redhat.com
Tue Feb 4 11:55:00 PST 2014
framework/source/services/substitutepathvars.cxx | 162 ----------
odk/examples/DevelopersGuide/OfficeDev/PathSubstitution/PathSubstitutionTest.java | 2
offapi/com/sun/star/util/PathSubstitution.idl | 4
3 files changed, 3 insertions(+), 165 deletions(-)
New commits:
commit d3a19d8eb7558bb7ca056ff31127c9002a7d0853
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Feb 4 15:04:05 2014 +0000
remove lang path substitution
it's unused internally as far as I can see and has very incomplete (and surely
some wrong values) from some sort of mid 90s Euro-centric worldview
Change-Id: Ibce9e8b76545791ab59b9e11c6ff6e1f33afcb3c
diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx
index 517aed8..b12331f 100644
--- a/framework/source/services/substitutepathvars.cxx
+++ b/framework/source/services/substitutepathvars.cxx
@@ -176,7 +176,6 @@ enum PreDefVariable
PREDEFVAR_HOME,
PREDEFVAR_TEMP,
PREDEFVAR_PATH,
- PREDEFVAR_LANG,
PREDEFVAR_LANGID,
PREDEFVAR_VLANG,
PREDEFVAR_INSTPATH,
@@ -373,7 +372,6 @@ static const FixedVariable aFixedVarTable[] =
{ RTL_CONSTASCII_STRINGPARAM("$(home)"), PREDEFVAR_HOME, true },
{ RTL_CONSTASCII_STRINGPARAM("$(temp)"), PREDEFVAR_TEMP, true },
{ RTL_CONSTASCII_STRINGPARAM("$(path)"), PREDEFVAR_PATH, true },
- { RTL_CONSTASCII_STRINGPARAM("$(lang)"), PREDEFVAR_LANG, false },
{ RTL_CONSTASCII_STRINGPARAM("$(langid)"), PREDEFVAR_LANGID, false },
{ RTL_CONSTASCII_STRINGPARAM("$(vlang)"), PREDEFVAR_VLANG, false },
{ RTL_CONSTASCII_STRINGPARAM("$(instpath)"), PREDEFVAR_INSTPATH, true },
@@ -1162,8 +1160,7 @@ throw ( RuntimeException )
if ( nPos >= 0 )
{
bool bMatch = true;
- if ( i->eVariable == PREDEFVAR_LANG ||
- i->eVariable == PREDEFVAR_LANGID ||
+ if ( i->eVariable == PREDEFVAR_LANGID ||
i->eVariable == PREDEFVAR_VLANG )
{
// Special path variables as they can occur in the middle of a path. Only match if they
@@ -1263,159 +1260,6 @@ throw ( NoSuchElementException, RuntimeException )
}
}
-namespace {
-const char* GetLang(LanguageType& nType)
-{
- if ( nType == LANGUAGE_SYSTEM || nType == LANGUAGE_DONTKNOW )
- nType = MsLangId::getSystemUILanguage();
-
- switch ( nType )
- {
- case LANGUAGE_DANISH:
- return "45";
-
- case LANGUAGE_DUTCH:
- case LANGUAGE_DUTCH_BELGIAN:
- return "31";
-
- case LANGUAGE_ENGLISH:
- case LANGUAGE_ENGLISH_UK:
- case LANGUAGE_ENGLISH_EIRE:
- case LANGUAGE_ENGLISH_SAFRICA:
- case LANGUAGE_ENGLISH_JAMAICA:
- case LANGUAGE_ENGLISH_BELIZE:
- case LANGUAGE_ENGLISH_TRINIDAD:
- case LANGUAGE_ENGLISH_ZIMBABWE:
- case LANGUAGE_ENGLISH_PHILIPPINES:
- return "44";
-
- case LANGUAGE_ENGLISH_US:
- case LANGUAGE_ENGLISH_CAN:
- return "01";
-
- case LANGUAGE_ENGLISH_AUS:
- case LANGUAGE_ENGLISH_NZ:
- return "61";
- case LANGUAGE_ESTONIAN:
- return "77";
-
-
- case LANGUAGE_FINNISH:
- return "35";
-
- case LANGUAGE_FRENCH_CANADIAN:
- return "02";
-
- case LANGUAGE_FRENCH:
- case LANGUAGE_FRENCH_BELGIAN:
- case LANGUAGE_FRENCH_SWISS:
- case LANGUAGE_FRENCH_LUXEMBOURG:
- case LANGUAGE_FRENCH_MONACO:
- return "33";
-
- case LANGUAGE_GERMAN:
- case LANGUAGE_GERMAN_SWISS:
- case LANGUAGE_GERMAN_AUSTRIAN:
- case LANGUAGE_GERMAN_LUXEMBOURG:
- case LANGUAGE_GERMAN_LIECHTENSTEIN:
- return "49";
-
- case LANGUAGE_ITALIAN:
- case LANGUAGE_ITALIAN_SWISS:
- return "39";
-
- case LANGUAGE_NORWEGIAN:
- case LANGUAGE_NORWEGIAN_BOKMAL:
- return "47";
-
- case LANGUAGE_PORTUGUESE:
- return "03";
-
- case LANGUAGE_PORTUGUESE_BRAZILIAN:
- return "55";
-
- case LANGUAGE_SPANISH_DATED:
- case LANGUAGE_SPANISH_MEXICAN:
- case LANGUAGE_SPANISH_MODERN:
- case LANGUAGE_SPANISH_GUATEMALA:
- case LANGUAGE_SPANISH_COSTARICA:
- case LANGUAGE_SPANISH_PANAMA:
- case LANGUAGE_SPANISH_DOMINICAN_REPUBLIC:
- case LANGUAGE_SPANISH_VENEZUELA:
- case LANGUAGE_SPANISH_COLOMBIA:
- case LANGUAGE_SPANISH_PERU:
- case LANGUAGE_SPANISH_ARGENTINA:
- case LANGUAGE_SPANISH_ECUADOR:
- case LANGUAGE_SPANISH_CHILE:
- case LANGUAGE_SPANISH_URUGUAY:
- case LANGUAGE_SPANISH_PARAGUAY:
- case LANGUAGE_SPANISH_BOLIVIA:
- return "34";
-
- case LANGUAGE_SWEDISH:
- return "46";
-
- case LANGUAGE_POLISH:
- return "48";
- case LANGUAGE_CZECH:
- return "42";
- case LANGUAGE_SLOVENIAN:
- return "50";
- case LANGUAGE_HUNGARIAN:
- return "36";
- case LANGUAGE_RUSSIAN:
- return "07";
- case LANGUAGE_SLOVAK:
- return "43";
- case LANGUAGE_GREEK:
- return "30";
- case LANGUAGE_TURKISH:
- return "90";
-
- case LANGUAGE_CHINESE_SIMPLIFIED:
- return "86";
- case LANGUAGE_CHINESE_TRADITIONAL:
- return "88";
- case LANGUAGE_JAPANESE:
- return "81";
- case LANGUAGE_KOREAN:
- case LANGUAGE_KOREAN_JOHAB:
- return "82";
- case LANGUAGE_THAI:
- return "66";
- case LANGUAGE_HINDI:
- return "91";
-
- case LANGUAGE_ARABIC_PRIMARY_ONLY:
- case LANGUAGE_ARABIC_IRAQ:
- case LANGUAGE_ARABIC_EGYPT:
- case LANGUAGE_ARABIC_LIBYA:
- case LANGUAGE_ARABIC_ALGERIA:
- case LANGUAGE_ARABIC_MOROCCO:
- case LANGUAGE_ARABIC_TUNISIA:
- case LANGUAGE_ARABIC_OMAN:
- case LANGUAGE_ARABIC_YEMEN:
- case LANGUAGE_ARABIC_SYRIA:
- case LANGUAGE_ARABIC_JORDAN:
- case LANGUAGE_ARABIC_LEBANON:
- case LANGUAGE_ARABIC_KUWAIT:
- case LANGUAGE_ARABIC_UAE:
- case LANGUAGE_ARABIC_BAHRAIN:
- case LANGUAGE_ARABIC_QATAR:
- return "96";
-
- case LANGUAGE_HEBREW:
- return "97";
-
- case LANGUAGE_CATALAN:
- return "37";
-
- default:
- return "99";
- }
-}
-}
-
void SubstitutePathVariables::SetPredefinedPathVariables( PredefinedPathVariables& aPreDefPathVariables )
{
@@ -1470,10 +1314,6 @@ void SubstitutePathVariables::SetPredefinedPathVariables( PredefinedPathVariable
// aPreDefPathVariables.m_eLanguageType has been initialized to a
// default value above anyway.
- // Set $(lang)
- aPreDefPathVariables.m_FixedVar[ PREDEFVAR_LANG ] = ConvertOSLtoUCBURL(
- OUString::createFromAscii( GetLang(aPreDefPathVariables.m_eLanguageType) ));
-
// Set $(vlang)
aPreDefPathVariables.m_FixedVar[ PREDEFVAR_VLANG ] = aLocaleStr;
diff --git a/odk/examples/DevelopersGuide/OfficeDev/PathSubstitution/PathSubstitutionTest.java b/odk/examples/DevelopersGuide/OfficeDev/PathSubstitution/PathSubstitutionTest.java
index f326a55..8f02684 100644
--- a/odk/examples/DevelopersGuide/OfficeDev/PathSubstitution/PathSubstitutionTest.java
+++ b/odk/examples/DevelopersGuide/OfficeDev/PathSubstitution/PathSubstitutionTest.java
@@ -45,7 +45,7 @@ public class PathSubstitutionTest extends java.lang.Object {
*/
private static String[] predefinedPathVariables = {
"$(home)","$(inst)","$(prog)","$(temp)","$(user)",
- "$(work)","$(path)","$(lang)","$(langid)","$(vlang)"
+ "$(work)","$(path)","$(langid)","$(vlang)"
};
/*
diff --git a/offapi/com/sun/star/util/PathSubstitution.idl b/offapi/com/sun/star/util/PathSubstitution.idl
index 14d1ce9..0b30fec 100644
--- a/offapi/com/sun/star/util/PathSubstitution.idl
+++ b/offapi/com/sun/star/util/PathSubstitution.idl
@@ -58,8 +58,6 @@ module com { module sun { module star { module util {
<dd>The current temporary directory.</dd>
<dt>\$(path)</dt>
<dd>The value of PATH environment variable.</dd>
- <dt>\$(lang)</dt>
- <dd>The country code used by the Office, like 01=English, 49=German.</dd>
<dt>\$(langid)</dt>
<dd>The language code used by the Office, like 0x0009=English, 0x0409=English US.</dd>
<dt>\$(vlang)</dt>
@@ -67,7 +65,7 @@ module com { module sun { module star { module util {
</dl>
<p>
Attention: Most predefined variables describe an absolute path.
- The only exceptions are: \$(lang), \$(langid) and \$(vlang).
+ The only exceptions are: \$(langid) and \$(vlang).
Therefore the service implementation should only substitute variables which
are located at the start of a provided path string or are part of a multi-path.
This special service is not designed to be a text substiution but shall
More information about the Libreoffice-commits
mailing list