i18nlangtag/source/isolang/isolang.cxx | 1 + include/i18nlangtag/lang.h | 1 + sc/source/core/data/documen7.cxx | 28 ++++++++++++---------------- svtools/source/misc/langtab.src | 1 + 4 files changed, 15 insertions(+), 16 deletions(-)
New commits: commit 5cf4deebeb69af2a107afd7f92d667b8cd971e57 Author: Eike Rathke <[email protected]> Date: Thu Jul 9 11:59:51 2015 +0200 tdf#90428 add Aranese [oc-ES] to language list Change-Id: Ieb66fd5d84afd666d66d47c936aa7ebdc7bcb1da diff --git a/i18nlangtag/source/isolang/isolang.cxx b/i18nlangtag/source/isolang/isolang.cxx index 94e9398..e0b1383 100644 --- a/i18nlangtag/source/isolang/isolang.cxx +++ b/i18nlangtag/source/isolang/isolang.cxx @@ -651,6 +651,7 @@ static IsoLanguageCountryEntry const aImplIsoLangEntries[] = { LANGUAGE_USER_CHURCH_SLAVIC, "cu", "RU", 0 }, { LANGUAGE_USER_VENETIAN, "vec", "IT", 0 }, { LANGUAGE_USER_ENGLISH_GAMBIA, "en", "GM", 0 }, + { LANGUAGE_USER_OCCITAN_ARANESE, "oc", "ES", 0 }, { LANGUAGE_MULTIPLE, "mul", "" , 0 }, // multiple languages, many languages are used { LANGUAGE_UNDETERMINED, "und", "" , 0 }, // undetermined language, language cannot be identified { LANGUAGE_NONE, "zxx", "" , 0 }, // added to ISO 639-2 on 2006-01-11: Used to declare the absence of linguistic information diff --git a/include/i18nlangtag/lang.h b/include/i18nlangtag/lang.h index 5453f02..420c68a 100644 --- a/include/i18nlangtag/lang.h +++ b/include/i18nlangtag/lang.h @@ -705,6 +705,7 @@ typedef unsigned short LanguageType; #define LANGUAGE_USER_CHURCH_SLAVIC 0x0694 #define LANGUAGE_USER_VENETIAN 0x0695 #define LANGUAGE_USER_ENGLISH_GAMBIA 0x9009 /* makeLangID( 0x24, getPrimaryLanguage( LANGUAGE_ENGLISH_UK)) */ +#define LANGUAGE_USER_OCCITAN_ARANESE 0x8082 /* makeLangID( 0x20, getPrimaryLanguage( LANGUAGE_OCCITAN_FRANCE)) */ /* Primary language ID range for on-the-fly assignment. */ diff --git a/svtools/source/misc/langtab.src b/svtools/source/misc/langtab.src index 0f00e69..19c1d6c 100644 --- a/svtools/source/misc/langtab.src +++ b/svtools/source/misc/langtab.src @@ -392,6 +392,7 @@ StringArray STR_ARR_SVT_LANGUAGE_TABLE < "Kven Finnish" ; LANGUAGE_USER_KVEN_FINNISH ; > ; < "Venetian" ; LANGUAGE_USER_VENETIAN ; > ; < "English (Gambia)" ; LANGUAGE_USER_ENGLISH_GAMBIA ; > ; + < "Aranese" ; LANGUAGE_USER_OCCITAN_ARANESE ; > ; }; }; commit f4b189df64cc6f6238a5bdf00390cd5dd5ac9e89 Author: Eike Rathke <[email protected]> Date: Thu Jul 9 11:24:55 2015 +0200 simplify the logic a little Change-Id: I8ff2bc971fd1ab7acf6c416ae85a03152ca2a3d9 diff --git a/sc/source/core/data/documen7.cxx b/sc/source/core/data/documen7.cxx index b67cce9..216bec2 100644 --- a/sc/source/core/data/documen7.cxx +++ b/sc/source/core/data/documen7.cxx @@ -424,24 +424,20 @@ void ScDocument::CalcFormulaTree( bool bOnlyForced, bool bProgressBar, bool bSet while ( pCell ) { if ( pCell->GetDirty() ) - pCell = pCell->GetNext(); // all clear - else + ; // nothing to do + else if ( pCell->GetCode()->IsRecalcModeAlways() ) { - if ( pCell->GetCode()->IsRecalcModeAlways() ) - { - // pCell and dependents are to be set dirty again, collect - // them first and broadcast afterwards to not break the - // FormulaTree chain here. - vAlwaysDirty.push_back( pCell); - pCell = pCell->GetNext(); - } - else - { // calculate the other single - if( bSetAllDirty ) - pCell->SetDirtyVar(); - pCell = pCell->GetNext(); - } + // pCell and dependents are to be set dirty again, collect + // them first and broadcast afterwards to not break the + // FormulaTree chain here. + vAlwaysDirty.push_back( pCell); + } + else if ( bSetAllDirty ) + { + // Force calculating all in tree, without broadcasting. + pCell->SetDirtyVar(); } + pCell = pCell->GetNext(); } for (::std::vector<ScFormulaCell*>::iterator it( vAlwaysDirty.begin()), itEnd( vAlwaysDirty.end()); it != itEnd; ++it) _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
