[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - extensions.lst
extensions.lst | 20 ++-- 1 file changed, 10 insertions(+), 10 deletions(-) New commits: commit 283f9bd000c187fe29edc04a23fcaf0da7459ece Author: Andrea PescettiDate: Tue Dec 26 22:02:37 2017 + #i127637# Sort components for languages that need multiple OXT files. diff --git a/extensions.lst b/extensions.lst index 881b69982889..fadba4b8d02e 100644 --- a/extensions.lst +++ b/extensions.lst @@ -38,11 +38,6 @@ # [ language=all && ENABLE_XXX ] #file://XXX.oxt -# Danish dictionary and synonyms -[ language=da ] -b38cba04b6513dd42b031199d617cce6 https://sourceforge.net/projects/aoo-extensions/files/1388/12/DanskeSynonymer.oxt/download "danske-synonymer.oxt" -6ee1e24fb17e44577d8e3200f3e44adc https://sourceforge.net/projects/aoo-extensions/files/1429/6/dict-da-current.oxt/download "dict-da.oxt" - # Asturian dictionary [ language=ast ] 931373dea3bed9621dd55713b53b38ae https://sourceforge.net/projects/aoo-extensions/files/3932/2/ort_ast_20150417_2259.oxt/download "dict-ast.oxt" @@ -59,6 +54,11 @@ [ language=ca_XR ] 6112a73444a1ad3cf70736649e228f0f https://sourceforge.net/projects/aoo-extensions/files/1395/0/dict_valencian_llit.oxt/download "dict-ca_xr.oxt" +# Danish dictionary and synonyms +[ language=da ] +6ee1e24fb17e44577d8e3200f3e44adc https://sourceforge.net/projects/aoo-extensions/files/1429/6/dict-da-current.oxt/download "dict-da.oxt" +b38cba04b6513dd42b031199d617cce6 https://sourceforge.net/projects/aoo-extensions/files/1388/12/DanskeSynonymer.oxt/download "danske-synonymer.oxt" + # German dictionary [ language=de || language=de_DE || language=nl || language=ru ] ea35a6a6761655107da3e99ee56c171f https://sourceforge.net/projects/aoo-extensions/files/1075/15/dict-de_de-frami_2017-01-12.oxt/download "dict-de_de.oxt" @@ -97,8 +97,8 @@ # Hungarian dictionary and grammar checker [ language=hu ] -76345f925e34fef2d29bade4f29108e9 https://sourceforge.net/projects/aoo-extensions/files/3423/4/lightproof-hu_HU-1.3.oxt/download "lightproof-hu_hu.oxt" d320e43e815c2dfd599dbfb7cd0e41fb https://sourceforge.net/projects/aoo-extensions/files/1283/9/dict-hu.oxt/download "dict-hu.oxt" +76345f925e34fef2d29bade4f29108e9 https://sourceforge.net/projects/aoo-extensions/files/3423/4/lightproof-hu_HU-1.3.oxt/download "lightproof-hu_hu.oxt" # Italian dictionary [ language=it || language=de || language=de_DE ] commit f2525d80a4ae4425bc43a1b43b96026294f29352 Author: Andrea Pescetti Date: Tue Dec 26 21:14:26 2017 + #i127637# Standardize on lowercase filenames for all bundled extensions. diff --git a/extensions.lst b/extensions.lst index 8dac95593825..881b69982889 100644 --- a/extensions.lst +++ b/extensions.lst @@ -40,7 +40,7 @@ # Danish dictionary and synonyms [ language=da ] -b38cba04b6513dd42b031199d617cce6 https://sourceforge.net/projects/aoo-extensions/files/1388/12/DanskeSynonymer.oxt/download "DanskeSynonymer.oxt" +b38cba04b6513dd42b031199d617cce6 https://sourceforge.net/projects/aoo-extensions/files/1388/12/DanskeSynonymer.oxt/download "danske-synonymer.oxt" 6ee1e24fb17e44577d8e3200f3e44adc https://sourceforge.net/projects/aoo-extensions/files/1429/6/dict-da-current.oxt/download "dict-da.oxt" # Asturian dictionary @@ -97,7 +97,7 @@ # Hungarian dictionary and grammar checker [ language=hu ] -76345f925e34fef2d29bade4f29108e9 https://sourceforge.net/projects/aoo-extensions/files/3423/4/lightproof-hu_HU-1.3.oxt/download "lightproof-hu_HU-1.3.oxt" +76345f925e34fef2d29bade4f29108e9 https://sourceforge.net/projects/aoo-extensions/files/3423/4/lightproof-hu_HU-1.3.oxt/download "lightproof-hu_hu.oxt" d320e43e815c2dfd599dbfb7cd0e41fb https://sourceforge.net/projects/aoo-extensions/files/1283/9/dict-hu.oxt/download "dict-hu.oxt" # Italian dictionary @@ -120,6 +120,10 @@ [ language=nl ] 5c0de383ef649cffefc128cfb36b4d43 https://sourceforge.net/projects/aoo-extensions/files/1456/6/nl-dict-v2.00g.oxt/download "dict-nl.oxt" +# Norwegian dictionary +[ language=nb ] +c06841f7f193e4f083482440999d801b https://sourceforge.net/projects/aoo-extensions/files/1216/2/dictionary-no-no-2.2.oxt/download "dict-no_no.oxt" + # Polish dictionary [ language=pl ] a69f9221864b1360e38ff3f0b0cc9222 https://sourceforge.net/projects/aoo-extensions/files/806/4/pl-dict.oxt/download "dict-pl.oxt" @@ -144,10 +148,6 @@ [ language=sl ] a95158fff7aa901938b9bc67c4937a88 https://sourceforge.net/projects/aoo-extensions/files/3280/10/pack-sl.oxt/download "dict-sl.oxt" -# Norwegian dictionary -[ language=nb ] -c06841f7f193e4f083482440999d801b https://sourceforge.net/projects/aoo-extensions/files/1216/2/dictionary-no-no-2.2.oxt/download "dict-no_no.oxt" - # Swedish dictionary [ language=sv ] 32ab4edf1496a7cf5469ee1643eb0128 https://sourceforge.net/projects/aoo-extensions/files/5959/1/dict-sv.oxt/download
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - extensions.lst LICENSE_ALv2
LICENSE_ALv2 |2 +- extensions.lst |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 2c3c479c9f3ca98db3cbad9349f6f7e753388fe0 Author: Andrea PescettiDate: Wed Oct 7 22:41:05 2015 + #i126573# Update English dictionary to version 2015.10.01 diff --git a/extensions.lst b/extensions.lst index e4a5732..736da8f 100644 --- a/extensions.lst +++ b/extensions.lst @@ -39,7 +39,7 @@ # English dictionary [ language=en.* || language=de || language=it ] -045c9cd45d6517c7304e77faeb502776 http://sourceforge.net/projects/aoo-extensions/files/17102/20/dict-en.oxt/download "dict-en.oxt" +f5f6aab4cc5d92a34ab13ad15332770c http://sourceforge.net/projects/aoo-extensions/files/17102/21/dict-en.oxt/download "dict-en.oxt" # English (USA, en_US) dictionary [ language==nl || language==ru ] commit 91e0583e901da858ed191a8d0b9ccb342ac64f44 Author: Andrea Pescetti Date: Wed Oct 7 22:08:56 2015 + #i126567# Extend copyright years. diff --git a/LICENSE_ALv2 b/LICENSE_ALv2 index 7a6a2a3..3a2f450 100644 --- a/LICENSE_ALv2 +++ b/LICENSE_ALv2 @@ -187,7 +187,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2011, 2012, 2013 Apache Software Foundation + Copyright 2011, 2012, 2013, 2014, 2015 Apache Software Foundation Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - extensions.lst sw/source
extensions.lst |2 - sw/source/core/graphic/ndgrf.cxx | 40 +-- 2 files changed, 39 insertions(+), 3 deletions(-) New commits: commit 58f18227a16379b5a4b3530b6ab2b683a63e6906 Author: Andrea Pescetti pesce...@apache.org Date: Mon Feb 10 22:56:42 2014 + #i124127# Update English dictionary to the latest (2014.02.10) version. diff --git a/extensions.lst b/extensions.lst index 1f53f19..e016099 100644 --- a/extensions.lst +++ b/extensions.lst @@ -39,7 +39,7 @@ # English dictionary [ language=en.* || language=de || language=it ] -043e3c42b1b2a20517f8069afb9cba24 http://sourceforge.net/projects/aoo-extensions/files/17102/2/dict-en-marcoagpinto-20140107.oxt/download dict-en.oxt +21000528c50707539220e05df554172f http://sourceforge.net/projects/aoo-extensions/files/17102/3/dict-en.oxt/download dict-en.oxt # English (USA, en_US) dictionary [ language==nl || language==ru ] commit a9325263271883fb147351d287c817ea7984fbe9 Author: Armin Le Grand a...@apache.org Date: Mon Feb 10 22:24:18 2014 + i15508 keep trhe original file and format AFAP when breaking links to graphic contents in Writer diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx index b96e13f..5fa944c 100644 --- a/sw/source/core/graphic/ndgrf.cxx +++ b/sw/source/core/graphic/ndgrf.cxx @@ -741,8 +741,11 @@ void SwGrfNode::ReleaseLink() { if( refLink.Is() ) { -// erst die Grafik reinswappen! -// if( aGraphic.IsSwapOut() || !refLink-IsSynchron() ) +// #15508# remember some stuff from the linked graphic +const String aFileName(maGrfObj.GetLink()); +const Graphic aLocalGraphic(maGrfObj.GetGraphic()); +const bool bHasOriginalData(aLocalGraphic.IsLink()); + { bInSwapIn = sal_True; SwBaseLink* pLink = (SwBaseLink*)(::sfx2::SvBaseLink*) refLink; @@ -750,9 +753,42 @@ void SwGrfNode::ReleaseLink() pLink-SwapIn( sal_True, sal_True ); bInSwapIn = sal_False; } + getIDocumentLinksAdministration()-GetLinkManager().Remove( refLink ); refLink.Clear(); maGrfObj.SetLink(); + +// #15508# added extra processing after getting rid of the link. Use whatever is +// known from the formally linked graphic to get to a state as close to a directly +// unlinked insterted graphic as possible. Goal is to have a valid GfxLink at the +// ImplGraphic (see there) that holds temporary data to the original data and type +// information about the original data. Only when this is given will +// SvXMLGraphicHelper::ImplInsertGraphicURL which is used at export use that type +// and use the original graphic at export for the ODF, without evtl. recoding +// of trhe bitmap graphic data to something without loss (e.g. PNG) but bigger +if(bHasOriginalData) +{ +// #15508# if we have the original data at the Graphic, let it survive +// by using that Graphic again, this time at a GraphicObject without link. +// This happens e.g. when inserting a linked graphic and breaking the link +maGrfObj.SetGraphic(aLocalGraphic); +} +else if(aFileName.Len()) +{ +// #15508# we have no original data, but a file name. This happens e.g. +// when inserting a linked graphic and save, reload document. Try to access +// that data from the original file; if this works, use it. Else use the +// data we have (but without knowing the original format) +int nRes = GRFILTER_OK; +GraphicFilter* pFlt = GraphicFilter::GetGraphicFilter(); +Graphic aNew; +nRes = GraphicFilter::LoadGraphic( aFileName, String(), aNew, pFlt); + +if(GRFILTER_OK == nRes) +{ +maGrfObj.SetGraphic(aNew); +} +} } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - extensions.lst
extensions.lst |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit f5c3f1a0fba83206f0ee5b434d27d844282718dc Author: Andrea Pescetti pesce...@apache.org Date: Tue Sep 10 05:33:01 2013 + #123152# Update bundled Italian it dictionary diff --git a/extensions.lst b/extensions.lst index e7a5ebe..9e47b4f 100644 --- a/extensions.lst +++ b/extensions.lst @@ -59,7 +59,7 @@ # Italian dictionary. [ language=it || language=de || language=de_DE ] -e7ad2666a727b594948cb672a31ba22d http://sourceforge.net/projects/aoo-extensions/files/1204/11/dict-it.oxt/download dict-it.oxt +67eb02751dda7b2d312a66bcb0505fd2 http://sourceforge.net/projects/aoo-extensions/files/1204/13/dict-it.oxt/download dict-it.oxt # Spanish dictionary. [ language=es ] commit 964b63c906438e21c649667de8b9b7e03394cc24 Author: Andrea Pescetti pesce...@apache.org Date: Tue Sep 10 05:25:22 2013 + #123214# Update bundled Gaelic gd dictionary diff --git a/extensions.lst b/extensions.lst index a4aef09..e7a5ebe 100644 --- a/extensions.lst +++ b/extensions.lst @@ -100,7 +100,7 @@ # Scottish Gaelic. [ language=gd ] -867d5509958a867fec1096b445fe4cec http://sourceforge.net/projects/aoo-extensions/files/4587/8/hunspell-gd-2.6.oxt/download hunspell-gd-2.6.oxt +88d92378c2bcf22f87f49bf594130238 http://sourceforge.net/projects/aoo-extensions/files/4587/9/hunspell-gd-2.7.oxt/download hunspell-gd-2.7.oxt # Basque. [ language=eu ] ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - extensions.lst officecfg/registry
extensions.lst |2 +- officecfg/registry/data/org/openoffice/Setup.xcu |7 +++ 2 files changed, 8 insertions(+), 1 deletion(-) New commits: commit 8e46b8bc28fffec586137b4b525d2e23648cceac Author: Andrea Pescetti pesce...@apache.org Date: Thu Sep 5 20:35:21 2013 + #123153# Update bundled French dictionary diff --git a/extensions.lst b/extensions.lst index a8d462f..a4aef09 100644 --- a/extensions.lst +++ b/extensions.lst @@ -55,7 +55,7 @@ # French dictionary. [ language=fr || language=nl || language=de || language=de_DE ] -47ca39e385b02839c24a5d953495cb98 http://sourceforge.net/projects/aoo-extensions/files/3554/5/ooo-dictionnaire-fr-moderne-v4.2.oxt/download ooo-dictionnaire-fr-moderne-v4.2.oxt +8f7ca241048c70bd7893995ac4bcca3b http://sourceforge.net/projects/aoo-extensions/files/17340/1/dict411.oxt/download dict411.oxt # Italian dictionary. [ language=it || language=de || language=de_DE ] commit e27707edb086073bb37f06cd37d40b46cfa36f2e Author: Andrea Pescetti pesce...@apache.org Date: Thu Sep 5 20:27:24 2013 + #123153# Blacklist old French dictionaries to allow updating to the new unified one. diff --git a/officecfg/registry/data/org/openoffice/Setup.xcu b/officecfg/registry/data/org/openoffice/Setup.xcu index 0bdf600..8e16ecc 100644 --- a/officecfg/registry/data/org/openoffice/Setup.xcu +++ b/officecfg/registry/data/org/openoffice/Setup.xcu @@ -1067,6 +1067,13 @@ itcom.sun.star.PresentationMinimizer-*/it !-- presentation screen is integrated since AOO 4.0 -- itcom.sun.PresenterScreen-*/it +!-- Old French dictionaries are incompatible with the new unified French dictionary since AOO 4.0.1 -- + itfrench.modern-dictionary.from.Dicollecte.by.OlivierR/it + itfrench.classic-dictionary.from.Dicollecte.by.OlivierR/it + itfrench.reform1990-dictionary.from.Dicollecte.by.OlivierR/it + itfrench.classic-and-reform1990-dictionary.from.Dicollecte.by.OlivierR/it + itorg.openoffice.comp.pyuno.lightproof.oxt.grammalecte/it + itorg.openoffice.comp.pyuno.lightproof.oxt.dicollecte_fr_FR/it /value /prop /node ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits