i18npool/source/localedata/data/he_IL.xml | 19 +++++++++++++------ officecfg/registry/data/org/openoffice/VCL.xcu | 10 +++++----- sw/source/core/text/porfld.cxx | 14 ++++++++++++-- sw/source/filter/html/htmlfldw.cxx | 5 +++-- 4 files changed, 33 insertions(+), 15 deletions(-)
New commits: commit 680b58efa54d5c5b773a7c2d57b3a27453c6a5a2 Author: Lior Kaplan <[email protected]> Date: Fri Nov 9 23:33:41 2012 +0100 fdo#46807: Add LRM before Shekel sign, forcing it to appear left of numbers introducing new Currency element and marking previous as legacyOnly Change-Id: I40a762bf03a15f241fc80279bb61be9a2710d2f0 Reviewed-on: https://gerrit.libreoffice.org/967 Reviewed-by: Lior Kaplan <[email protected]> Tested-by: Lior Kaplan <[email protected]> Reviewed-by: Eike Rathke <[email protected]> (cherry picked from commit dcbf9238ba3354aafbcbfa0c15980587cf31fe96) Signed-off-by: Lior Kaplan <[email protected]> diff --git a/i18npool/source/localedata/data/he_IL.xml b/i18npool/source/localedata/data/he_IL.xml index 5a32ce6..f00a606 100644 --- a/i18npool/source/localedata/data/he_IL.xml +++ b/i18npool/source/localedata/data/he_IL.xml @@ -34,7 +34,7 @@ <TimePM>PM</TimePM> <MeasurementSystem>metric</MeasurementSystem> </LC_CTYPE> - <LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$âª-40D]"> + <LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$ââª-40D]"> <DateAcceptancePattern>D/M</DateAcceptancePattern> <FormatElement msgid="DateFormatskey1" default="true" type="short" usage="DATE" formatindex="18"> <FormatCode>D/M/YY</FormatCode> @@ -397,6 +397,13 @@ <LC_CURRENCY> <Currency default="true" usedInCompatibleFormatCodes="true"> <CurrencyID>ILS</CurrencyID> + <CurrencySymbol>ââª</CurrencySymbol> + <BankSymbol>ILS</BankSymbol> + <CurrencyName>New Israeli Sheqel</CurrencyName> + <DecimalPlaces>2</DecimalPlaces> + </Currency> + <Currency default="false" usedInCompatibleFormatCodes="false" legacyOnly="true"> + <CurrencyID>ILS</CurrencyID> <CurrencySymbol>âª</CurrencySymbol> <BankSymbol>ILS</BankSymbol> <CurrencyName>New Israeli Sheqel</CurrencyName> commit f44dcba2a77391b031b74ab7292951330a4acf29 Author: Lior Kaplan <[email protected]> Date: Thu Nov 1 18:11:51 2012 +0200 Consolidate ⪠appearances to a CURRENCY template Change-Id: Ibde3ac38e27e5abb42aa5d538762a3a5a7401f2b Reviewed-on: https://gerrit.libreoffice.org/966 Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Caolán McNamara <[email protected]> (cherry picked from commit 087f8ca17e94ffb3b1525a4d6e9be1c6b81184f7) Signed-off-by: Lior Kaplan <[email protected]> diff --git a/i18npool/source/localedata/data/he_IL.xml b/i18npool/source/localedata/data/he_IL.xml index d641641..5a32ce6 100644 --- a/i18npool/source/localedata/data/he_IL.xml +++ b/i18npool/source/localedata/data/he_IL.xml @@ -34,7 +34,7 @@ <TimePM>PM</TimePM> <MeasurementSystem>metric</MeasurementSystem> </LC_CTYPE> - <LC_FORMAT> + <LC_FORMAT replaceFrom="[CURRENCY]" replaceTo="[$âª-40D]"> <DateAcceptancePattern>D/M</DateAcceptancePattern> <FormatElement msgid="DateFormatskey1" default="true" type="short" usage="DATE" formatindex="18"> <FormatCode>D/M/YY</FormatCode> @@ -155,22 +155,22 @@ <FormatCode>#,###.00</FormatCode> </FormatElement> <FormatElement msgid="CurrencyFormatskey1" default="true" type="short" usage="CURRENCY" formatindex="12"> - <FormatCode>[$âª-40D] #,##0;[$âª-40D] -#,##0</FormatCode> + <FormatCode>[CURRENCY] #,##0;[CURRENCY] -#,##0</FormatCode> </FormatElement> <FormatElement msgid="CurrencyFormatskey2" default="false" type="medium" usage="CURRENCY" formatindex="13"> - <FormatCode>[$âª-40D] #,##0.00;[$âª-40D] -#,##0.00</FormatCode> + <FormatCode>[CURRENCY] #,##0.00;[CURRENCY] -#,##0.00</FormatCode> </FormatElement> <FormatElement msgid="CurrencyFormatskey3" default="false" type="medium" usage="CURRENCY" formatindex="14"> - <FormatCode>[$âª-40D] #,##0;[RED][$âª-40D] -#,##0</FormatCode> + <FormatCode>[CURRENCY] #,##0;[RED][CURRENCY] -#,##0</FormatCode> </FormatElement> <FormatElement msgid="CurrencyFormatskey4" default="true" type="medium" usage="CURRENCY" formatindex="15"> - <FormatCode>[$âª-40D] #,##0.00;[RED][$âª-40D] -#,##0.00</FormatCode> + <FormatCode>[CURRENCY] #,##0.00;[RED][CURRENCY] -#,##0.00</FormatCode> </FormatElement> <FormatElement msgid="CurrencyFormatskey5" default="false" type="medium" usage="CURRENCY" formatindex="16"> <FormatCode>#,##0.00 CCC</FormatCode> </FormatElement> <FormatElement msgid="CurrencyFormatskey6" default="false" type="medium" usage="CURRENCY" formatindex="17"> - <FormatCode>[$âª-40D] #,##0.--;[RED][$âª-40D] -#,##0.--</FormatCode> + <FormatCode>[CURRENCY] #,##0.--;[RED][CURRENCY] -#,##0.--</FormatCode> </FormatElement> <FormatElement msgid="PercentFormatskey1" default="true" type="short" usage="PERCENT_NUMBER" formatindex="8"> <FormatCode>0%</FormatCode> commit 9d8d8c8432ceb146bc88e4cfed9011208a53db8a Author: Caolán McNamara <[email protected]> Date: Tue Nov 6 11:36:03 2012 +0000 Resolves: fdo#56554 hyphen in RTL date field split RTL processing If we split a range into complex and non-complex, and then decide that the non-complex range is RTL after all, then extend the original complex range to cover the additional RTL sequence. Which keeps the full chunk together to be processed correctly Change-Id: I66a5d585cb22fdb5b6c1de2a8665a9c2c9134f88 (cherry picked from commit deaa86b263e47965eeb67ebb179023bdf5ba82c2) Signed-off-by: Lior Kaplan <[email protected]> diff --git a/sw/source/core/text/porfld.cxx b/sw/source/core/text/porfld.cxx index 9ac6a64..a53d05f 100644 --- a/sw/source/core/text/porfld.cxx +++ b/sw/source/core/text/porfld.cxx @@ -244,7 +244,9 @@ void SwFldPortion::CheckScript( const SwTxtSizeInfo &rInf ) const sal_uInt8 nFldDir = ( IsNumberPortion() || IsFtnNumPortion() ) ? rSI.GetDefaultDir() : rSI.DirType( IsFollow() ? rInf.GetIdx() - 1 : rInf.GetIdx() ); - if ( UBIDI_RTL == nFldDir ) + + bool bPerformUBA = UBIDI_LTR != nFldDir ? true : i18n::ScriptType::COMPLEX == nScript; + if (bPerformUBA) { UErrorCode nError = U_ZERO_ERROR; UBiDi* pBidi = ubidi_openSized( aTxt.Len(), 0, &nError ); @@ -274,8 +276,16 @@ void SwFldPortion::CheckScript( const SwTxtSizeInfo &rInf ) } } - if ( nCurrDir == UBIDI_RTL ) + if (nCurrDir == UBIDI_RTL) + { nTmp = SW_CTL; + //If we decided that this range was RTL after all and the + //previous range was complex but clipped to the start of this + //range, then extend it to be complex over the additional RTL + //range + if (nScript == i18n::ScriptType::COMPLEX) + nNextScriptChg = nNextDirChg; + } } // #i98418# commit 81d9ca8be4f3abdbd4214110f07a34bd6246f7d8 Author: Caolán McNamara <[email protected]> Date: Mon Nov 5 15:08:29 2012 +0000 Related: fdo#56554 fix multi-script html field export Change-Id: I05257bed8161e0a63814c9a563d79e5750f626ff (cherry picked from commit 4c49af256a456af48f0b29262c0b23aa1f6a9cd5) Signed-off-by: Lior Kaplan <[email protected]> diff --git a/sw/source/filter/html/htmlfldw.cxx b/sw/source/filter/html/htmlfldw.cxx index ed72fcc..35150a0 100644 --- a/sw/source/filter/html/htmlfldw.cxx +++ b/sw/source/filter/html/htmlfldw.cxx @@ -374,6 +374,7 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pFld, SwHTMLWriter::GetCSS1ScriptForScriptType( nScriptType ); xub_StrLen nEndPos = (xub_StrLen)pBreakIt->GetBreakIter()->endOfScript( sExpand, nPos, nScriptType ); + xub_StrLen nChunkLen = nEndPos - nPos; if( nScript != CSS1_OUTMODE_ANY_SCRIPT && /* #108791# */ nScript != rHTMLWrt.nCSS1Script ) { @@ -403,7 +404,7 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pFld, } } - HTMLOutFuncs::Out_String( rWrt.Strm(), sExpand.Copy( nPos, nEndPos ), + HTMLOutFuncs::Out_String( rWrt.Strm(), sExpand.Copy( nPos, nChunkLen ), rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters ); rHTMLWrt.bTagOn = sal_False; @@ -413,7 +414,7 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pFld, } else { - HTMLOutFuncs::Out_String( rWrt.Strm(), sExpand.Copy( nPos, nEndPos ), + HTMLOutFuncs::Out_String( rWrt.Strm(), sExpand.Copy( nPos, nChunkLen ), rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters ); } nPos = nEndPos; commit 283fd1bda90f3d1325a7adeeb4c33a891efb4a4a Author: Lior Kaplan <[email protected]> Date: Thu Oct 18 18:56:06 2012 +0200 fdo#55034 Update default Hebrew font from Lucida Sans to Lucida Sans Unicode Change-Id: Ia2204dda0cb452a4ce38a44db61d17d6802b5a38 (cherry picked from commit a40f08c1ac97078fa501da7c6dc456aa12146f25) Signed-off-by: Lior Kaplan <[email protected]> diff --git a/officecfg/registry/data/org/openoffice/VCL.xcu b/officecfg/registry/data/org/openoffice/VCL.xcu index e01d207..f3763e4 100644 --- a/officecfg/registry/data/org/openoffice/VCL.xcu +++ b/officecfg/registry/data/org/openoffice/VCL.xcu @@ -187,19 +187,19 @@ <value>Tahoma;Arial Unicode MS;Lucida Sans Unicode;DejaVu Sans;Albany AMT;Albany;Arial;Nimbus Sans L;Interface User;Geneva;Tahoma;Dialog;Lucida;Helvetica;Helmet;Interface System;Sans Serif</value> </prop> <prop oor:name="CTL_DISPLAY" oor:type="xs:string" oor:op="replace"> - <value>Nachlieli CLM;Miriam CLM;Ellinia CLM;Aharoni CLM;Drugulin CLM;Miriam Mono CLM;Lucidasans;Lucida Sans;Arial Unicode MS</value> + <value>Nachlieli CLM;Miriam CLM;Ellinia CLM;Aharoni CLM;Drugulin CLM;Miriam Mono CLM;Lucida Sans Unicode;Arial Unicode MS</value> </prop> <prop oor:name="CTL_HEADING" oor:type="xs:string" oor:op="replace"> - <value>Nachlieli CLM;Miriam CLM;Ellinia CLM;Aharoni CLM;Drugulin CLM;Miriam Mono CLM;Lucidasans;Lucida Sans;Arial Unicode MS</value> + <value>Nachlieli CLM;Miriam CLM;Ellinia CLM;Aharoni CLM;Drugulin CLM;Miriam Mono CLM;Lucida Sans Unicode;Arial Unicode MS</value> </prop> <prop oor:name="CTL_PRESENTATION" oor:type="xs:string" oor:op="replace"> - <value>Nachlieli CLM;Miriam CLM;Ellinia CLM;Aharoni CLM;Drugulin CLM;Miriam Mono CLM;Lucidasans;Lucida Sans;Arial Unicode MS</value> + <value>Nachlieli CLM;Miriam CLM;Ellinia CLM;Aharoni CLM;Drugulin CLM;Miriam Mono CLM;Lucida Sans Unicode;Arial Unicode MS</value> </prop> <prop oor:name="CTL_SPREADSHEET" oor:type="xs:string" oor:op="replace"> - <value>Nachlieli CLM;Miriam CLM;Ellinia CLM;Aharoni CLM;Drugulin CLM;Miriam Mono CLM;Lucidasans;Lucida Sans;Arial Unicode MS</value> + <value>Nachlieli CLM;Miriam CLM;Ellinia CLM;Aharoni CLM;Drugulin CLM;Miriam Mono CLM;Lucida Sans Unicode;Arial Unicode MS</value> </prop> <prop oor:name="CTL_TEXT" oor:type="xs:string" oor:op="replace"> - <value>Nachlieli CLM;Miriam CLM;Ellinia CLM;Aharoni CLM;Drugulin CLM;Miriam Mono CLM;Lucidasans;Lucida Sans;Arial Unicode MS</value> + <value>Nachlieli CLM;Miriam CLM;Ellinia CLM;Aharoni CLM;Drugulin CLM;Miriam Mono CLM;Lucida Sans Unicode;Arial Unicode MS</value> </prop> </node> <node oor:name="th" oor:op="replace">
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
