lngconvex.cxx (7950f2af) lngconvex.cxx (2e3a1b6e)
1/**************************************************************
2 *
3 * Licensed to the Apache Software Foundation (ASF) under one
4 * or more contributor license agreements. See the NOTICE file
5 * distributed with this work for additional information
6 * regarding copyright ownership. The ASF licenses this file
7 * to you under the Apache License, Version 2.0 (the
8 * "License"); you may not use this file except in compliance

--- 455 unchanged lines hidden (view full) ---

464
465 std::string lang_section("LANGUAGE ");
466
467 LanguageType ltype = MsLangId::convertIsoNamesToLanguage(iso_lang.language(), iso_lang.country());
468
469 char buff[10];
470 int primLangID = PRIMARYLANGID(ltype);
471 int subLangID = SUBLANGID(ltype);
1/**************************************************************
2 *
3 * Licensed to the Apache Software Foundation (ASF) under one
4 * or more contributor license agreements. See the NOTICE file
5 * distributed with this work for additional information
6 * regarding copyright ownership. The ASF licenses this file
7 * to you under the Apache License, Version 2.0 (the
8 * "License"); you may not use this file except in compliance

--- 455 unchanged lines hidden (view full) ---

464
465 std::string lang_section("LANGUAGE ");
466
467 LanguageType ltype = MsLangId::convertIsoNamesToLanguage(iso_lang.language(), iso_lang.country());
468
469 char buff[10];
470 int primLangID = PRIMARYLANGID(ltype);
471 int subLangID = SUBLANGID(ltype);
472 // Our resources are normaly not sub language dependent.
472 // Our resources are normally not sub language dependent.
473 // Esp. for spanish we don't want to distinguish between trad.
473 // Esp. for spanish we don't want to distinguish between trad.
474 // and internatinal sorting ( which leads to two different sub languages )
474 // and international sorting ( which leads to two different sub languages )
475 // Setting the sub language to neutral allows us to use one
476 // stringlist for all spanish variants ( see #123126# )
477 if ( ( primLangID == LANG_SPANISH ) &&
478 ( subLangID == SUBLANG_SPANISH ) )
479 subLangID = SUBLANG_NEUTRAL;
480
481 _itoa(primLangID, buff, 16);
482 lang_section += std::string("0x") + std::string(buff);

--- 119 unchanged lines hidden --- 		475 // Setting the sub language to neutral allows us to use one
476 // stringlist for all spanish variants ( see #123126# )
477 if ( ( primLangID == LANG_SPANISH ) &&
478 ( subLangID == SUBLANG_SPANISH ) )
479 subLangID = SUBLANG_NEUTRAL;
480
481 _itoa(primLangID, buff, 16);
482 lang_section += std::string("0x") + std::string(buff);

--- 119 unchanged lines hidden ---