[PATCH libreoffice-4-1] add sid auxiliary files
Hi, I would like you to review the following patch: https://gerrit.libreoffice.org/5294 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/help refs/changes/94/5294/1 add sid auxiliary files Change-Id: Iec7caac1f2c3c4f96db69adb9ecd696f420e7e6c --- A source/auxiliary/sid/default.css A source/auxiliary/sid/highcontrast1.css A source/auxiliary/sid/highcontrast2.css A source/auxiliary/sid/highcontrastblack.css A source/auxiliary/sid/highcontrastwhite.css A source/auxiliary/sid/sbasic.cfg A source/auxiliary/sid/scalc.cfg A source/auxiliary/sid/schart.cfg A source/auxiliary/sid/sdatabase.cfg A source/auxiliary/sid/sdraw.cfg A source/auxiliary/sid/simpress.cfg A source/auxiliary/sid/smath.cfg A source/auxiliary/sid/swriter.cfg 13 files changed, 745 insertions(+), 0 deletions(-) diff --git a/source/auxiliary/sid/default.css b/source/auxiliary/sid/default.css new file mode 100644 index 000..d48c646 --- /dev/null +++ b/source/auxiliary/sid/default.css @@ -0,0 +1,108 @@ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the License); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + +/* ++ ++ OPENOFFICE.ORG 2.0 HELP + ++ DEFAULT STYLESHEET + ++ WESTERN LANGUAGES + ++ ++ LAST CHANGES: 15-NOV-2004 + ++ +*/ + + +body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable + { font-family: Albany AMT,Albany,Arial,Nimbus Sans L,Bitstream Vera Sans,Helvetica,Lucida,Geneva,Helmet,Andale Sans UI,Arial Unicode MS,Lucida Sans Unicode,Tahoma,sans-serif; } + +pre, .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable + { font-family: Cumberland AMT,Cumberland,Courier New,Nimbus Mono L,Bitstream Vera Sans Mono,Courier,Lucida Sans Typewriter,Lucida Typewriter,Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;} + +.acronym + { font-weight: bold; } + +.related + { font-weight: bold; margin-top:20pt; border-top: 1px solid black;} + +.emph, .menuitem, .keycode + { font-weight: bold; } + +.tablehead, .tableheadintable + { font-weight: bold; margin-top: 0px;} + +.howtogetheader + { font-weight: bold; border: 1px solid #99; background: #FF; padding: 3px;} + +h1, h2, h3, h4, h5, h6 + { margin-bottom: 5pt; } + +p, td + { font-size: 10pt; margin-top: 2px; margin-bottom: 2px;} + +h1 + { font-size: 18pt; border-bottom: 1px solid black; padding-bottom: 6px; margin-bottom: 6px;} + +h2 + { font-size: 14pt; } + +h3 + { font-size: 12pt; } + +h4, h5, h6 + { font-size: 10pt; } + +.relatedtopics + { font-weight: normal; } + +.relatedbody + { margin-top: 2px; margin-bottom: 2px; margin-left: 5px; } + +.howtoget + { background:#EE;} + +.howtogetbody + { background:#EE; margin: 0px;} + +.wide + { width: 100%; } + +.topalign +{ vertical-align: top; border: 1px;} + +.bug + { color: red; border: 1px solid red;} + +.debug + { border: 1px solid black; padding: 3px; display: none;} + +/* Basic code syntax highlight */ +.identifier, .unknown + { color: green;} + +.keyword + { color: blue;} + +.comment + { color: gray;} + +.number, .string + { color: red;} + +.operator, .parameter + { color: black;} + diff --git a/source/auxiliary/sid/highcontrast1.css b/source/auxiliary/sid/highcontrast1.css new file mode 100644 index 000..ba39fb2 --- /dev/null +++ b/source/auxiliary/sid/highcontrast1.css @@ -0,0 +1,109 @@ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the
[PATCH libreoffice-4-1] updated Spanish dictionary pack to 0.7
Hi, I would like you to review the following patch: https://gerrit.libreoffice.org/4985 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/dictionaries refs/changes/85/4985/1 updated Spanish dictionary pack to 0.7 Versión 0.7: - Más modificaciones en los ficheros de afijos (prefijo contra-). - Agregado de lemas faltantes, gracias a Alejandro Moreno y KNTRO. - Revisión de la lista de abreviaturas. - Corrección de archivos de sinónimos y creación de script asociado. Change-Id: I4c852b6b7796822cb5c72c4633fab48003fdc147 --- M es/README_es_ANY.txt M es/description.xml M es/es_ANY.aff M es/es_ANY.dic M es/package-description.txt M es/th_es_ANY_v2.dat 6 files changed, 12,647 insertions(+), 12,299 deletions(-) -- To view, visit https://gerrit.libreoffice.org/4985 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4c852b6b7796822cb5c72c4633fab48003fdc147 Gerrit-PatchSet: 1 Gerrit-Project: dictionaries Gerrit-Branch: libreoffice-4-1 Gerrit-Owner: Andras Timar ati...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0] updated Spanish dictionary pack to 0.7
Hi, I would like you to review the following patch: https://gerrit.libreoffice.org/4986 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/dictionaries refs/changes/86/4986/1 updated Spanish dictionary pack to 0.7 Versión 0.7: - Más modificaciones en los ficheros de afijos (prefijo contra-). - Agregado de lemas faltantes, gracias a Alejandro Moreno y KNTRO. - Revisión de la lista de abreviaturas. - Corrección de archivos de sinónimos y creación de script asociado. Change-Id: Iae6fef300292f1df2753f7bdb45040d66c168bb6 --- M es/README_es_ANY.txt M es/description.xml M es/es_ANY.aff M es/es_ANY.dic M es/package-description.txt M es/th_es_ANY_v2.dat 6 files changed, 12,627 insertions(+), 12,279 deletions(-) -- To view, visit https://gerrit.libreoffice.org/4986 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iae6fef300292f1df2753f7bdb45040d66c168bb6 Gerrit-PatchSet: 1 Gerrit-Project: dictionaries Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Andras Timar ati...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-1] update pt-PT dictionary
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/4948 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/dictionaries refs/changes/48/4948/1 update pt-PT dictionary Change-Id: Ie4dbe9a0a5da536a8d2e3ce1b679c28376706b0c --- M pt_PT/description.xml M pt_PT/pt_PT.aff M pt_PT/pt_PT.dic 3 files changed, 680 insertions(+), 635 deletions(-) -- To view, visit https://gerrit.libreoffice.org/4948 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie4dbe9a0a5da536a8d2e3ce1b679c28376706b0c Gerrit-PatchSet: 1 Gerrit-Project: dictionaries Gerrit-Branch: libreoffice-4-1 Gerrit-Owner: Andras Timar ati...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0] update pt-PT dictionary
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/4949 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/dictionaries refs/changes/49/4949/1 update pt-PT dictionary Change-Id: Ie4dbe9a0a5da536a8d2e3ce1b679c28376706b0c --- M pt_PT/description.xml M pt_PT/pt_PT.aff M pt_PT/pt_PT.dic 3 files changed, 680 insertions(+), 635 deletions(-) -- To view, visit https://gerrit.libreoffice.org/4949 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie4dbe9a0a5da536a8d2e3ce1b679c28376706b0c Gerrit-PatchSet: 1 Gerrit-Project: dictionaries Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Andras Timar ati...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED libreoffice-4-1] fdo#66007 - spurious causing entity warning errors
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/4691 Approvals: Andras Timar: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/4691 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I122816833b315cc62b856a461cb3f3671dd68042 Gerrit-PatchSet: 2 Gerrit-Project: translations Gerrit-Branch: libreoffice-4-1 Gerrit-Owner: Christian Lohmaier lohmaier+libreoff...@googlemail.com Gerrit-Reviewer: Andras Timar ati...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Fix for broken dutch spell checker fdo#65994 and fdo#63033
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/4451 Approvals: Andras Timar: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/4451 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I522bb85cfbb9330439d4ea47901695d2bf78 Gerrit-PatchSet: 4 Gerrit-Project: dictionaries Gerrit-Branch: master Gerrit-Owner: Thomas van der meulen meulentho...@gmail.com Gerrit-Reviewer: Andras Timar ati...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-1] Add Amhraic (am) auxiliary files
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/4551 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/help refs/changes/51/4551/1 Add Amhraic (am) auxiliary files Change-Id: I3ef1018e8b40b3c1626d5add7ffa217da6419a0c --- A source/auxiliary/am/default.css A source/auxiliary/am/highcontrast1.css A source/auxiliary/am/highcontrast2.css A source/auxiliary/am/highcontrastblack.css A source/auxiliary/am/highcontrastwhite.css A source/auxiliary/am/sbasic.cfg A source/auxiliary/am/scalc.cfg A source/auxiliary/am/schart.cfg A source/auxiliary/am/sdatabase.cfg A source/auxiliary/am/sdraw.cfg A source/auxiliary/am/simpress.cfg A source/auxiliary/am/smath.cfg A source/auxiliary/am/swriter.cfg 13 files changed, 745 insertions(+), 0 deletions(-) diff --git a/source/auxiliary/am/default.css b/source/auxiliary/am/default.css new file mode 100644 index 000..e406e4e --- /dev/null +++ b/source/auxiliary/am/default.css @@ -0,0 +1,108 @@ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the License); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + +/* ++ ++ OPENOFFICE.ORG 2.0 HELP + ++ DEFAULT STYLESHEET + ++ WESTERN LANGUAGES + ++ ++ LAST CHANGES: 15-NOV-2004 + ++ +*/ + + +body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable + { font-family: Nyala,Abyssinica SIL,sans-serif; } + +pre, .code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable + { font-family: Nyala,Abyssinica SIL,Monospaced; margin-top: 1pt; margin-bottom: 1pt;} + +.acronym + { font-weight: bold; } + +.related + { font-weight: bold; margin-top:20pt; border-top: 1px solid black;} + +.emph, .menuitem, .keycode + { font-weight: bold; } + +.tablehead, .tableheadintable + { font-weight: bold; margin-top: 0px;} + +.howtogetheader + { font-weight: bold; border: 1px solid #99; background: #FF; padding: 3px;} + +h1, h2, h3, h4, h5, h6 + { margin-bottom: 5pt; } + +p, td + { font-size: 10pt; margin-top: 2px; margin-bottom: 2px;} + +h1 + { font-size: 18pt; border-bottom: 1px solid black; padding-bottom: 6px; margin-bottom: 6px;} + +h2 + { font-size: 14pt; } + +h3 + { font-size: 12pt; } + +h4, h5, h6 + { font-size: 10pt; } + +.relatedtopics + { font-weight: normal; } + +.relatedbody + { margin-top: 2px; margin-bottom: 2px; margin-left: 5px; } + +.howtoget + { background:#EE;} + +.howtogetbody + { background:#EE; margin: 0px;} + +.wide + { width: 100%; } + +.topalign +{ vertical-align: top; border: 1px;} + +.bug + { color: red; border: 1px solid red;} + +.debug + { border: 1px solid black; padding: 3px; display: none;} + +/* Basic code syntax highlight */ +.identifier, .unknown + { color: green;} + +.keyword + { color: blue;} + +.comment + { color: gray;} + +.number, .string + { color: red;} + +.operator, .parameter + { color: black;} + diff --git a/source/auxiliary/am/highcontrast1.css b/source/auxiliary/am/highcontrast1.css new file mode 100644 index 000..4d5c10e --- /dev/null +++ b/source/auxiliary/am/highcontrast1.css @@ -0,0 +1,109 @@ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + *
[PUSHED] Cleaning: remove use of old edt1 from dlg.h (Windows)
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/4283 Approvals: Andras Timar: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/4283 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9d56726508a9fbf2607c9d18b7b33eca340f1b9f Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Julien Nabet serval2...@yahoo.fr Gerrit-Reviewer: Andras Timar ati...@suse.com Gerrit-Reviewer: Julien Nabet serval2...@yahoo.fr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED libreoffice-4-1] fdo#65666 keep tab characters in footnote settings (Begin/Af...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/4234 Approvals: Németh László: Verified; Looks good to me, but someone else must approve Andras Timar: Verified; Looks good to me, approved Objections: Miklos Vajna: This need some tweaks before it is merged -- To view, visit https://gerrit.libreoffice.org/4234 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3fbd0f2dea5926981c0cd351c3235f6b61e66aaa Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-1 Gerrit-Owner: Németh László nem...@numbertext.org Gerrit-Reviewer: Andras Timar ati...@suse.com Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz Gerrit-Reviewer: Németh László nem...@numbertext.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED libreoffice-4-0] fdo#65666 keep tab characters in footnote settings (Begin/Af...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/4235 Approvals: Andras Timar: Verified; Looks good to me, approved Objections: Miklos Vajna: This need some tweaks before it is merged -- To view, visit https://gerrit.libreoffice.org/4235 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3fbd0f2dea5926981c0cd351c3235f6b61e66aaa Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Németh László nem...@numbertext.org Gerrit-Reviewer: Andras Timar ati...@suse.com Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Update pt-BR dictionary and grammar checker
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/4120 -- To view, visit https://gerrit.libreoffice.org/4120 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic30dcf8588b3408d59cb960956e9e1cf8d6a330b Gerrit-PatchSet: 2 Gerrit-Project: dictionaries Gerrit-Branch: master Gerrit-Owner: Olivier Hallot olivier.hal...@edx.srv.br Gerrit-Reviewer: Andras Timar ati...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED libreoffice-4-0] Update Dutch Hunspell to 2.10g too (fdo#63033 related)
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/4119 Approvals: Andras Timar: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/4119 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia83eb1c894c8aa1fb710dfefceeb4ead3d323f08 Gerrit-PatchSet: 2 Gerrit-Project: dictionaries Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Joren De Cuyper joren.libreoff...@telenet.be Gerrit-Reviewer: Andras Timar ati...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#64926 use icu's breakiterator for Tibetan and Dzongkha
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/4082 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/82/4082/1 fdo#64926 use icu's breakiterator for Tibetan and Dzongkha Change-Id: I78010e216eb1582fa5074666f36c95f5b0eceee5 --- M i18npool/source/breakiterator/breakiterator_unicode.cxx 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/i18npool/source/breakiterator/breakiterator_unicode.cxx b/i18npool/source/breakiterator/breakiterator_unicode.cxx index 620bba1..549abd1 100644 --- a/i18npool/source/breakiterator/breakiterator_unicode.cxx +++ b/i18npool/source/breakiterator/breakiterator_unicode.cxx @@ -120,7 +120,8 @@ rbi = new OOoRuleBasedBreakIterator(udata_open(OpenOffice, brk, OUStringToOString(breakRules[breakType], RTL_TEXTENCODING_ASCII_US).getStr(), status), status); } -else if (rLocale.Language != th rLocale.Language != km) //use icu's breakiterator for Thai and Khmer +//use icu's breakiterator for Thai, Khmer, Tibetan and Dzongkha +else if (rLocale.Language != th rLocale.Language != km rLocale.Language != bo rLocale.Language != dz) { status = U_ZERO_ERROR; OStringBuffer aUDName(64); -- To view, visit https://gerrit.libreoffice.org/4082 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I78010e216eb1582fa5074666f36c95f5b0eceee5 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Andras Timar ati...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0] fdo#65039 UI: Oxygen theme has wrong icon for Power regressi...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/4063 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/63/4063/1 fdo#65039 UI: Oxygen theme has wrong icon for Power regression Change-Id: I86b927d5c2e6a643beac8b9a151f572c028c18f3 --- D icon-themes/oxygen/chart2/res/regpow.png 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/icon-themes/oxygen/chart2/res/regpow.png b/icon-themes/oxygen/chart2/res/regpow.png deleted file mode 100644 index fa9313f..000 --- a/icon-themes/oxygen/chart2/res/regpow.png +++ /dev/null Binary files differ -- To view, visit https://gerrit.libreoffice.org/4063 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I86b927d5c2e6a643beac8b9a151f572c028c18f3 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Andras Timar ati...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-3-6] fdo#65039 UI: Oxygen theme has wrong icon for Power regressi...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/4064 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/64/4064/1 fdo#65039 UI: Oxygen theme has wrong icon for Power regression Change-Id: I86b927d5c2e6a643beac8b9a151f572c028c18f3 --- D icon-themes/oxygen/chart2/res/regpow.png 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/icon-themes/oxygen/chart2/res/regpow.png b/icon-themes/oxygen/chart2/res/regpow.png deleted file mode 100644 index fa9313f..000 --- a/icon-themes/oxygen/chart2/res/regpow.png +++ /dev/null Binary files differ -- To view, visit https://gerrit.libreoffice.org/4064 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I86b927d5c2e6a643beac8b9a151f572c028c18f3 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Andras Timar ati...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0] fdo#64652 remove length restriction of Replace edit box
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3986 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/86/3986/1 fdo#64652 remove length restriction of Replace edit box Change-Id: I0141dc06d940e64244909ddcb8b7e5bb797c337f --- M cui/source/tabpages/autocdlg.cxx 1 file changed, 0 insertions(+), 1 deletion(-) diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index 48bd0c7..a99ec37 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -896,7 +896,6 @@ aReplaceED.SetSpaces( sal_True ); aShortED.SetSpaces( sal_True ); -aShortED.SetMaxTextLen( 30 ); } OfaAutocorrReplacePage::~OfaAutocorrReplacePage() -- To view, visit https://gerrit.libreoffice.org/3986 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0141dc06d940e64244909ddcb8b7e5bb797c337f Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Andras Timar ati...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0] fdo#46553 Update embedded manifest on win32 builds to declar...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3987 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/87/3987/1 fdo#46553 Update embedded manifest on win32 builds to declare dpiAware Reviewed-on: https://gerrit.libreoffice.org/3981 Reviewed-by: Fridrich Strba fridr...@documentfoundation.org Tested-by: Fridrich Strba fridr...@documentfoundation.org Conflicts: solenv/gbuild/platform/com_MSC_class.mk Change-Id: I71a3960b21f2c996b97e1a5707f20b30819fd6bd --- M solenv/gbuild/platform/com_MSC_class.mk A solenv/inc/DeclareDPIAware.manifest 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk index c965f2b..9adb9ff 100644 --- a/solenv/gbuild/platform/com_MSC_class.mk +++ b/solenv/gbuild/platform/com_MSC_class.mk @@ -152,6 +152,7 @@ $(if $(DLLTARGET),; if [ ! -f $(DLLTARGET) ]; then rm -f $(1) false; fi) \ $(if $(filter Library,$(TARGETTYPE)),; if [ -f $(DLLTARGET).manifest ]; then mt.exe $(MTFLAGS) -nologo -manifest $(DLLTARGET).manifest -outputresource:$(DLLTARGET)\;2; fi) \ $(if $(filter Executable,$(TARGETTYPE)),; if [ -f $(1).manifest ]; then mt.exe $(MTFLAGS) -nologo -manifest $(1).manifest -outputresource:$(1)\;1; fi) \ + $(if $(filter YES,$(TARGETGUI)),; if [ -f $(SRCDIR)/solenv/inc/DeclareDPIAware.manifest ]; then mt.exe $(MTFLAGS) -nologo -manifest $(SRCDIR)/solenv/inc/DeclareDPIAware.manifest -updateresource:$(1)\;1 ; fi) \ ; exit $$RC) endef diff --git a/solenv/inc/DeclareDPIAware.manifest b/solenv/inc/DeclareDPIAware.manifest new file mode 100644 index 000..bb01230 --- /dev/null +++ b/solenv/inc/DeclareDPIAware.manifest @@ -0,0 +1,7 @@ +assembly xmlns=urn:schemas-microsoft-com:asm.v1 manifestVersion=1.0 xmlns:asmv3=urn:schemas-microsoft-com:asm.v3 + asmv3:application +asmv3:windowsSettings xmlns=http://schemas.microsoft.com/SMI/2005/WindowsSettings; + dpiAwaretrue/dpiAware +/asmv3:windowsSettings + /asmv3:application +/assembly -- To view, visit https://gerrit.libreoffice.org/3987 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I71a3960b21f2c996b97e1a5707f20b30819fd6bd Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Andras Timar ati...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0] make 64-bit shell extensions work, put 64-bit VC runtime in ...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3990 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/90/3990/1 make 64-bit shell extensions work, put 64-bit VC runtime in the same dir Unlike in case of msvcr90.dll, which went to WinSxS, msvcr100.dll is installed to the system32 folder. Windows installer automatically replaces it to SysWOW64. The problem is that this way 64-bit dlls end up in the wrong directory. They conflict with the 32-bit dlls, and will not be installed. Therefore 64-bit shell extensions will not work, unless the 64-bit VC runtime is installed from other source. It is not possible to install both 32-bit and 64-bit VC Runtime with merge modules in case of VS 2010 and VS 2012. For the 64-bit shell extensions, we can install the runtime dlls next to the files. Conflicts: scp2/source/ooo/vc_redist.scp Change-Id: I47060f8ff764ca1156596139ecbec003f964bc60 --- M download M external/msvcp100/README_msvcX100.dll M external/prj/d.lst M oowintool M scp2/source/ooo/vc_redist.scp M scp2/source/winexplorerext/file_winexplorerext.scp M scp2/source/winexplorerext/module_winexplorerext.scp 7 files changed, 58 insertions(+), 37 deletions(-) diff --git a/download b/download index 985443c..a04d1f4 100755 --- a/download +++ b/download @@ -50,14 +50,9 @@ fi if [ $COM = MSC ]; then -if [ $CPUNAME = INTEL ]; then -ver= -else -ver=-64 -fi # use oowintool to copy CRT dlls and manifest -if ! ./oowintool --msvc-copy-dlls$ver ./external/msvcp ; then - echo oowintool failed to copy CRT +if ! ./oowintool --msvc-copy-dlls-64 ./external/msvcp ; then + echo oowintool failed to copy 64-bit CRT exit 1 fi @@ -65,11 +60,6 @@ if ! ./oowintool --msvc-copy-msms$ver ./external/msm$VCVER ; then echo oowintool failed to copy merge modules exit 1 -fi -if [ $CPUNAME = INTEL ]; then -if ! ./oowintool --msvc-copy-msms-64 ./external/msm$VCVER ; then - echo WARNING: oowintool failed to copy x64 merge modules, installation will lack the 64-bit Explorer extension -fi fi fi diff --git a/external/msvcp100/README_msvcX100.dll b/external/msvcp100/README_msvcX100.dll index a1b0e73..ada64ed 100644 --- a/external/msvcp100/README_msvcX100.dll +++ b/external/msvcp100/README_msvcX100.dll @@ -1,2 +1,2 @@ -Put msvcp100.dll, msvcr100.dll in this directory for Windows builds using a +Put 64-bit msvcp100.dll, msvcr100.dll in this directory for Windows builds using a VS 2010 / VC 10.0 compiler. diff --git a/external/prj/d.lst b/external/prj/d.lst index 7ee2582..c357edc 100644 --- a/external/prj/d.lst +++ b/external/prj/d.lst @@ -36,6 +36,10 @@ ..\msvcp90\msvcr90*.dll %_DEST%\bin ..\msvcp90\Microsoft.VC90.CRT.manifest %_DEST%\bin\Microsoft.VC90.CRT.manifest ..\msvcp90\Microsoft.VC90.DebugCRT.manifest %_DEST%\bin\Microsoft.VC90.DebugCRT.manifest +..\msvcp100\msvcp100*.dll %_DEST%\bin +..\msvcp100\msvcr100*.dll %_DEST%\bin +..\msvcp110\msvcp110*.dll %_DEST%\bin +..\msvcp110\msvcr110*.dll %_DEST%\bin ..\msm90\*.msm %_DEST%\bin ..\msm100\*.msm %_DEST%\bin ..\msm110\*.msm %_DEST%\bin diff --git a/oowintool b/oowintool index 26221f0..6f5ab7c 100755 --- a/oowintool +++ b/oowintool @@ -313,7 +313,7 @@ my $srcdir = (cygpath ($ver-{'product_dir'}, 'w', 'u') . '/' . $ver-{'dll_path'}); -$srcdir =~ s/x86/amd64/ if ($arch eq 'amd64'); +$srcdir =~ s|/x86/|/x64/| if ($arch eq 'amd64'); copy_dll ($srcdir, msvcp . $ver-{'dll_suffix'} . .dll, $dest . $ver-{'dll_suffix'}); diff --git a/scp2/source/ooo/vc_redist.scp b/scp2/source/ooo/vc_redist.scp index fa7d1c2..82cd0d0 100644 --- a/scp2/source/ooo/vc_redist.scp +++ b/scp2/source/ooo/vc_redist.scp @@ -87,26 +87,4 @@ #endif -#if defined(WITH_VC100_REDIST) - -MergeModule gid_MergeModule_Microsoft_VC100_CRT_x64 -Feature = gm_Root; -Name = Microsoft_VC100_CRT_x64.msm; -RootDir = TARGETDIR; -ComponentCondition = VC_REDIST=1; -End - -#endif - -#if defined(WITH_VC110_REDIST) - -MergeModule gid_MergeModule_Microsoft_VC110_CRT_x64 -Feature = gm_Root; -Name = Microsoft_VC110_CRT_x64.msm; -RootDir = TARGETDIR; -ComponentCondition = VC_REDIST=1; -End - -#endif - #endif diff --git a/scp2/source/winexplorerext/file_winexplorerext.scp b/scp2/source/winexplorerext/file_winexplorerext.scp index f2a2a89..1aadacf 100644 --- a/scp2/source/winexplorerext/file_winexplorerext.scp +++ b/scp2/source/winexplorerext/file_winexplorerext.scp @@ -95,3 +95,48 @@ Dir = SCP2_OOO_BIN_DIR; Name = shlxtmsi.dll; End + +#ifdef BUILD_X64 + +#if defined(WITH_VC100_REDIST) + +File gid_File_Lib_Msvcr100 +LIB_FILE_BODY; +Styles = (PACKED); +Dir = gid_Dir_Shlxthdl; +Name = msvcr100.dll; +ComponentCondition = VersionNT64; +End + +File gid_File_Lib_Msvcp100 +LIB_FILE_BODY; +Styles = (PACKED); +Dir =
[PATCH] fdo#46553 Update embedded manifest on win32 builds to declar...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3981 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/81/3981/1 fdo#46553 Update embedded manifest on win32 builds to declare dpiAware Change-Id: I71a3960b21f2c996b97e1a5707f20b30819fd6bd --- M solenv/gbuild/platform/com_MSC_class.mk A solenv/inc/DeclareDPIAware.manifest 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk index 1ea0466..bd033d5 100644 --- a/solenv/gbuild/platform/com_MSC_class.mk +++ b/solenv/gbuild/platform/com_MSC_class.mk @@ -219,6 +219,7 @@ $(if $(DLLTARGET),; if [ ! -f $(DLLTARGET) ]; then rm -f $(1) false; fi) \ $(if $(filter Library,$(TARGETTYPE)), if [ -f $(DLLTARGET).manifest ]; then mt.exe $(MTFLAGS) -nologo -manifest $(DLLTARGET).manifest -outputresource:$(DLLTARGET)\;2 touch -r $(1) $(DLLTARGET).manifest $(DLLTARGET); fi) \ $(if $(filter Executable,$(TARGETTYPE)), if [ -f $(1).manifest ]; then mt.exe $(MTFLAGS) -nologo -manifest $(1).manifest -outputresource:$(1)\;1 touch -r $(1) $(1).manifest; fi) \ + $(if $(filter YES,$(TARGETGUI)), if [ -f $(SRCDIR)/solenv/inc/DeclareDPIAware.manifest ]; then mt.exe $(MTFLAGS) -nologo -manifest $(SRCDIR)/solenv/inc/DeclareDPIAware.manifest -updateresource:$(1)\;1 ; fi) \ $(if $(filter Library,$(TARGETTYPE)), \ echo $(notdir $(DLLTARGET)) $(1).exports.tmp \ $(if $(filter YES,$(LIBRARY_X64)),$(LINK_X64_BINARY),$(gb_LINK)) \ diff --git a/solenv/inc/DeclareDPIAware.manifest b/solenv/inc/DeclareDPIAware.manifest new file mode 100644 index 000..bb01230 --- /dev/null +++ b/solenv/inc/DeclareDPIAware.manifest @@ -0,0 +1,7 @@ +assembly xmlns=urn:schemas-microsoft-com:asm.v1 manifestVersion=1.0 xmlns:asmv3=urn:schemas-microsoft-com:asm.v3 + asmv3:application +asmv3:windowsSettings xmlns=http://schemas.microsoft.com/SMI/2005/WindowsSettings; + dpiAwaretrue/dpiAware +/asmv3:windowsSettings + /asmv3:application +/assembly -- To view, visit https://gerrit.libreoffice.org/3981 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I71a3960b21f2c996b97e1a5707f20b30819fd6bd Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Andras Timar ati...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#64652 remove length restriction of Replace edit box
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3920 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/20/3920/1 fdo#64652 remove length restriction of Replace edit box Change-Id: Ib35a6c2968c4633b565aaf47bb5358f15890083f --- M cui/uiconfig/ui/acorreplacepage.ui 1 file changed, 0 insertions(+), 1 deletion(-) diff --git a/cui/uiconfig/ui/acorreplacepage.ui b/cui/uiconfig/ui/acorreplacepage.ui index aa04bcb..572057f 100644 --- a/cui/uiconfig/ui/acorreplacepage.ui +++ b/cui/uiconfig/ui/acorreplacepage.ui @@ -65,7 +65,6 @@ property name=visibleTrue/property property name=can_focusTrue/property property name=hexpandTrue/property -property name=max_length30/property property name=invisible_char●/property /object packing -- To view, visit https://gerrit.libreoffice.org/3920 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib35a6c2968c4633b565aaf47bb5358f15890083f Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Andras Timar ati...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] String to OUString in calc header footer edit
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3911 Approvals: Andras Timar: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3911 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6aa0f055f89c05c3d799b5ed1b21188f7f3a8268 Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Olivier Hallot olivier.hal...@edx.srv.br Gerrit-Reviewer: Andras Timar ati...@suse.com Gerrit-Reviewer: Luboš Luňák l.lu...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0] add dictionaries to ca-XV language pack
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3898 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/98/3898/1 add dictionaries to ca-XV language pack Change-Id: I1afb4388bbb811a7d296b86a4a8b77758964daaf --- M setup_native/source/packinfo/spellchecker_selection.txt 1 file changed, 1 insertion(+), 0 deletions(-) diff --git a/setup_native/source/packinfo/spellchecker_selection.txt b/setup_native/source/packinfo/spellchecker_selection.txt index 6593a64..8944609 100644 --- a/setup_native/source/packinfo/spellchecker_selection.txt +++ b/setup_native/source/packinfo/spellchecker_selection.txt @@ -34,6 +34,7 @@ br = br,fr bs = bs ca = ca,an,es,fr,it,oc +ca-XV = ca,an,es,fr,it,oc cs = cs da = da,de de = de,fr,it -- To view, visit https://gerrit.libreoffice.org/3898 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1afb4388bbb811a7d296b86a4a8b77758964daaf Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Andras Timar ati...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] remove empty string (fixes a warning)
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3909 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/09/3909/1 remove empty string (fixes a warning) Ulfex warning: inavlid po attributes extracted from /home/timar/libreoffice-master/sysui/desktop/share/launcher_unityquicklist.ulf No string specified! GroupID: startcenter Change-Id: I39b08feb8bb691da17a7a7ed5d17411720ae1d6a --- M sysui/desktop/share/launcher_unityquicklist.ulf 1 file changed, 0 insertions(+), 3 deletions(-) diff --git a/sysui/desktop/share/launcher_unityquicklist.ulf b/sysui/desktop/share/launcher_unityquicklist.ulf index 0f489bb..c41a645 100644 --- a/sysui/desktop/share/launcher_unityquicklist.ulf +++ b/sysui/desktop/share/launcher_unityquicklist.ulf @@ -15,6 +15,3 @@ [draw] en-US = New Drawing - -[startcenter] -en-US = -- To view, visit https://gerrit.libreoffice.org/3909 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I39b08feb8bb691da17a7a7ed5d17411720ae1d6a Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Andras Timar ati...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0] fdo#64382 replace lt to lt-LT
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3835 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/dictionaries refs/changes/35/3835/1 fdo#64382 replace lt to lt-LT Change-Id: Ibf480fd79e664f2d6d9b4aeb166c72ee6b28ddb5 --- M lt_LT/dictionaries.xcu 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lt_LT/dictionaries.xcu b/lt_LT/dictionaries.xcu index 74bc180..484fec5 100644 --- a/lt_LT/dictionaries.xcu +++ b/lt_LT/dictionaries.xcu @@ -10,7 +10,7 @@ valueDICT_SPELL/value /prop prop oor:name=Locales oor:type=oor:string-list -valuelt/value +valuelt-LT/value /prop /node node oor:name=HyphDic_lt oor:op=fuse @@ -21,7 +21,7 @@ valueDICT_HYPH/value /prop prop oor:name=Locales oor:type=oor:string-list -valuelt/value +valuelt-LT/value /prop /node /node -- To view, visit https://gerrit.libreoffice.org/3835 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibf480fd79e664f2d6d9b4aeb166c72ee6b28ddb5 Gerrit-PatchSet: 1 Gerrit-Project: dictionaries Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Andras Timar ati...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0] lt: bump version number to force update of user profile
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3836 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/dictionaries refs/changes/36/3836/1 lt: bump version number to force update of user profile Change-Id: I5ca0425c0f5bf746da64f17d796e1a6e27e6d171 --- M lt_LT/description.xml 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lt_LT/description.xml b/lt_LT/description.xml index ddfcd2e..96cc3d0 100644 --- a/lt_LT/description.xml +++ b/lt_LT/description.xml @@ -1,6 +1,6 @@ ?xml version=1.0 encoding=UTF-8? description xmlns=http://openoffice.org/extensions/description/2006; xmlns:d=http://openoffice.org/extensions/description/2006; xmlns:xlink=http://www.w3.org/1999/xlink; -version value=1.3 / +version value=1.3.1 / identifier value=org.openoffice.lt.hunspell.dictionaries / display-name name lang=en-USLithuanian spelling dictionary, and hyphenation rules/name -- To view, visit https://gerrit.libreoffice.org/3836 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5ca0425c0f5bf746da64f17d796e1a6e27e6d171 Gerrit-PatchSet: 1 Gerrit-Project: dictionaries Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Andras Timar ati...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0] fdo#64205 escape '' in help text with nowiki tag
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3845 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/help refs/changes/45/3845/1 fdo#64205 escape '' in help text with nowiki tag Change-Id: I07fed20194bcb4223c1070866fd147388da57ba9 --- M to-wiki/wikiconv2.py 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/to-wiki/wikiconv2.py b/to-wiki/wikiconv2.py index 00d43d2..fb19eae 100755 --- a/to-wiki/wikiconv2.py +++ b/to-wiki/wikiconv2.py @@ -129,7 +129,8 @@ [[$[officename], {{ProductName}}], [%PRODUCTNAME, {{ProductName}}], [$PRODUCTNAME, {{ProductName}}], - [font size, u\u200dfont size] + [font size, u\u200dfont size], + ['',nowiki''/nowiki] ] def get_link_filename(link, name): -- To view, visit https://gerrit.libreoffice.org/3845 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I07fed20194bcb4223c1070866fd147388da57ba9 Gerrit-PatchSet: 1 Gerrit-Project: help Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Andras Timar ati...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] solve fdo#63033 update Dutch dictionary OpenTaal to version ...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3844 Approvals: Andras Timar: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3844 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia4ccb06b0db4cdd976d2ec4491e14b82eefa558b Gerrit-PatchSet: 4 Gerrit-Project: dictionaries Gerrit-Branch: master Gerrit-Owner: Thomas van der meulen meulentho...@gmail.com Gerrit-Reviewer: Andras Timar ati...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0] fdo#64294 Update Slovak dictionaries
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3830 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/dictionaries refs/changes/30/3830/1 fdo#64294 Update Slovak dictionaries Change-Id: I60b2a150e04a028837ecc1d206ffa3aea7e9257c --- M sk_SK/README_en.txt M sk_SK/README_sk.txt M sk_SK/README_th_sk_SK_v2.txt M sk_SK/description.xml M sk_SK/sk_SK.aff M sk_SK/sk_SK.dic M sk_SK/th_sk_SK_v2.dat 7 files changed, 15,140 insertions(+), 81,942 deletions(-) -- To view, visit https://gerrit.libreoffice.org/3830 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I60b2a150e04a028837ecc1d206ffa3aea7e9257c Gerrit-PatchSet: 1 Gerrit-Project: dictionaries Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Andras Timar ati...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] fdo#63154: Remove _CL and _LF from solar.h
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3740 Approvals: Andras Timar: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3740 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I05b0325006845e48eb5483485a9042aa7b0cd22a Gerrit-PatchSet: 4 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Marcos Souza marcos.souza@gmail.com Gerrit-Reviewer: Andras Timar ati...@suse.com Gerrit-Reviewer: Eike Rathke er...@redhat.com Gerrit-Reviewer: Marcos Souza marcos.souza@gmail.com Gerrit-Reviewer: Tor Lillqvist t...@iki.fi ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Related fdo#35546 Improve Layout of Insert Photo Album Dia...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3833 Approvals: Andras Timar: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3833 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib880023b956c6d94d8110829d0c32281854a0705 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Samuel Mehrbrodt s.mehrbr...@gmail.com Gerrit-Reviewer: Andras Timar ati...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Drop String.AppendAscii from filter
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3799 Approvals: Andras Timar: Verified; Looks good to me, approved Marcos Souza: Looks good to me, but someone else must approve -- To view, visit https://gerrit.libreoffice.org/3799 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I73f61b9a20297b6b704aca52b1fc9efac563a224 Gerrit-PatchSet: 4 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Ricardo Montania rica...@linuxafundo.com.br Gerrit-Reviewer: Andras Timar ati...@suse.com Gerrit-Reviewer: Marcos Souza marcos.souza@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Related fdo#35546: Cosmetic fixes for Photo Album Dialog
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3834 Approvals: Andras Timar: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3834 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5c5d3d54b7e21063628c4cdb4a92f534ec4a3088 Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Samuel Mehrbrodt s.mehrbr...@gmail.com Gerrit-Reviewer: Andras Timar ati...@suse.com Gerrit-Reviewer: Samuel Mehrbrodt s.mehrbr...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0] fdo#64211 replace / to %2F in HIDs for wiki redirects
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3811 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/help refs/changes/11/3811/1 fdo#64211 replace / to %2F in HIDs for wiki redirects Change-Id: I93780b76e17a3b833ef4ee6a50bb0969ab8bb01c --- M to-wiki/wikiconv2.py M upload-wiki.pl 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/to-wiki/wikiconv2.py b/to-wiki/wikiconv2.py index 0e3bb5b..00d43d2 100755 --- a/to-wiki/wikiconv2.py +++ b/to-wiki/wikiconv2.py @@ -457,7 +457,7 @@ self.app = parser.current_app_raw self.target = parser.wiki_page_name self.authoritative = parser.follow_embed -self.redirect = name +self.redirect = name.replace(/, %2F) def get_all(self): global redirects @@ -1359,7 +1359,7 @@ def write_redirects(): print 'Generating the redirects...' written = {} -# in the first pass, immediately writte the links that are embedded, so that +# in the first pass, immediately write the links that are embedded, so that # we can always point to that source versions for redir in redirects: app = redir[0] diff --git a/upload-wiki.pl b/upload-wiki.pl index 1337900..13e2bc6 100755 --- a/upload-wiki.pl +++ b/upload-wiki.pl @@ -120,6 +120,7 @@ my $pagename = $File::Find::name; $pagename =~ s/^wiki\///; $pagename =~ s/\/MAIN$//; +$pagename =~ s/%2F/\//g; # pages starting with lowercase 's' are redirects if ( $pagename =~ /^s/ ) { -- To view, visit https://gerrit.libreoffice.org/3811 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I93780b76e17a3b833ef4ee6a50bb0969ab8bb01c Gerrit-PatchSet: 1 Gerrit-Project: help Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Andras Timar ati...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0] fdo#64211 replace %2F to / in online (wiki) help URLs
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3817 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/17/3817/1 fdo#64211 replace %2F to / in online (wiki) help URLs It is not possible to create wiki pages with URLs that have %2F in them. Help URLs contain %2F, when invoked from dialogs that are based on .ui files, it seems this is the new HID syntax. For example for Zoom dialog LibreOffice used to call http://help.libreoffice.org/simpress/cui%2Fui%2Fzoomdialog%2Fzoomsb and it did not work. Now it calls http://help.libreoffice.org/simpress/cui/ui/zoomdialog/zoomsb and it works. Conflicts: sfx2/source/appl/sfxhelp.cxx Change-Id: I163cf8ec3b69f31eadbbd9085d2180839fe91e07 --- M sfx2/source/appl/sfxhelp.cxx 1 file changed, 1 insertion(+), 0 deletions(-) diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx index b2be3e3..7ed8bdd 100644 --- a/sfx2/source/appl/sfxhelp.cxx +++ b/sfx2/source/appl/sfxhelp.cxx @@ -660,6 +660,7 @@ OUString aHelpLink( http://help.libreoffice.org/; ); aHelpLink += rURL.Copy( aInternal.Len() ); +aHelpLink = aHelpLink.replaceAlL(%2F,/); try { Reference XSystemShellExecute xSystemShell( -- To view, visit https://gerrit.libreoffice.org/3817 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I163cf8ec3b69f31eadbbd9085d2180839fe91e07 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Andras Timar ati...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED libreoffice-4-0] configure: don't enable ENABLE_NPAPI_FROM_BROWSER with --ena...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3786 Approvals: Andras Timar: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3786 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iba718969dca90563ba9e60aa16944e6de67c7141 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Riccardo Magliocchetti riccardo.magliocche...@gmail.com Gerrit-Reviewer: Andras Timar ati...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED libreoffice-3-6] fdo#64150 don't segfault when there is no line
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3768 Approvals: Andras Timar: Verified; Looks good to me, approved Chris Sherlock: Looks good to me, but someone else must approve -- To view, visit https://gerrit.libreoffice.org/3768 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iab36de3d407925cdb0e092afae457907f0261b3e Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Lionel Elie Mamane lio...@mamane.lu Gerrit-Reviewer: Andras Timar ati...@suse.com Gerrit-Reviewer: Chris Sherlock chris.sherloc...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0] fdo#54087 refactor/fix browser plugin detection on Windows
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3784 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/84/3784/1 fdo#54087 refactor/fix browser plugin detection on Windows Former code did not find the Firefox plugin, if it was registered under HKEY_CURRENT_USER. Therefore the checkbox state was not preserved in Tools - Options - Internet - Browser Plug-in. Change-Id: I9ae2a7dae1501500d7ea7cb42517605219450af3 --- M cui/source/dialogs/winpluginlib.cxx 1 file changed, 5 insertions(+), 26 deletions(-) diff --git a/cui/source/dialogs/winpluginlib.cxx b/cui/source/dialogs/winpluginlib.cxx index ce4ab24..5391375 100644 --- a/cui/source/dialogs/winpluginlib.cxx +++ b/cui/source/dialogs/winpluginlib.cxx @@ -33,36 +33,17 @@ extern C { int lc_isInstalled(const char* realFilePath) { -HKEY hKeySoftware; -HKEY hMozillaPlugins; -HKEY hStarOffice; +HKEY hLibreOffice; char sSoPath[SO_PATH_SIZE]; char sPluginPath[SO_PATH_SIZE]; LONG ret; -ret = RegOpenKeyEx(HKEY_LOCAL_MACHINE, SOFTWARE, 0, KEY_READ, hKeySoftware); +ret = RegOpenKeyEx(HKEY_LOCAL_MACHINE, SOFTWARE\\MozillaPlugins\\@sun.com/npsopluginmi;version=1.0, 0, KEY_READ, hLibreOffice); if(ret != ERROR_SUCCESS){ -ret = RegOpenKeyEx(HKEY_CURRENT_USER, SOFTWARE, 0, KEY_READ, hKeySoftware); +ret = RegOpenKeyEx(HKEY_CURRENT_USER, SOFTWARE\\MozillaPlugins\\@sun.com/npsopluginmi;version=1.0, 0, KEY_READ, hLibreOffice); if(ret != ERROR_SUCCESS){ return -1; } -} -ret = RegOpenKeyEx(hKeySoftware, MozillaPlugins, 0, KEY_READ, hMozillaPlugins); -if(ret != ERROR_SUCCESS){ -RegCloseKey(hKeySoftware); -if( ret == ERROR_FILE_NOT_FOUND) -return 1; -else -return -1; -} -ret = RegOpenKeyEx(hMozillaPlugins, @sun.com/npsopluginmi;version=1.0, 0, KEY_READ, hStarOffice); -if(ret != ERROR_SUCCESS){ -RegCloseKey(hKeySoftware); -RegCloseKey(hMozillaPlugins); -if( ret == ERROR_FILE_NOT_FOUND) -return 1; -else -return -1; } if((realFilePath == NULL) || (strlen(realFilePath) == 0) || (strlen(realFilePath) = SO_PATH_SIZE)) @@ -76,7 +57,7 @@ if(ret == 0){ DWORD dType = REG_SZ; DWORD dSize = SO_PATH_SIZE; -ret = RegQueryValueEx (hStarOffice, Path, NULL, dType , (LPBYTE) sPluginPath, dSize); +ret = RegQueryValueEx (hLibreOffice, Path, NULL, dType , (LPBYTE) sPluginPath, dSize); if(ret == ERROR_SUCCESS){ if(strcmp(sPluginPath, sSoPath) == 0) ret = 0; @@ -88,9 +69,7 @@ } else ret = -1; -RegCloseKey(hStarOffice); -RegCloseKey(hMozillaPlugins); -RegCloseKey(hKeySoftware); +RegCloseKey(hLibreOffice); return ret; } -- To view, visit https://gerrit.libreoffice.org/3784 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9ae2a7dae1501500d7ea7cb42517605219450af3 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Andras Timar ati...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-3-6] fdo#54087 refactor/fix browser plugin detection on Windows
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3785 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/85/3785/1 fdo#54087 refactor/fix browser plugin detection on Windows Former code did not find the Firefox plugin, if it was registered under HKEY_CURRENT_USER. Therefore the checkbox state was not preserved in Tools - Options - Internet - Browser Plug-in. Change-Id: I9ae2a7dae1501500d7ea7cb42517605219450af3 --- M cui/source/dialogs/winpluginlib.cxx 1 file changed, 5 insertions(+), 26 deletions(-) diff --git a/cui/source/dialogs/winpluginlib.cxx b/cui/source/dialogs/winpluginlib.cxx index 237e33b..b34d3be 100644 --- a/cui/source/dialogs/winpluginlib.cxx +++ b/cui/source/dialogs/winpluginlib.cxx @@ -42,36 +42,17 @@ extern C { int lc_isInstalled(const char* realFilePath) { -HKEY hKeySoftware; -HKEY hMozillaPlugins; -HKEY hStarOffice; +HKEY hLibreOffice; char sSoPath[SO_PATH_SIZE]; char sPluginPath[SO_PATH_SIZE]; LONG ret; -ret = RegOpenKeyEx(HKEY_LOCAL_MACHINE, SOFTWARE, 0, KEY_READ, hKeySoftware); +ret = RegOpenKeyEx(HKEY_LOCAL_MACHINE, SOFTWARE\\MozillaPlugins\\@sun.com/npsopluginmi;version=1.0, 0, KEY_READ, hLibreOffice); if(ret != ERROR_SUCCESS){ -ret = RegOpenKeyEx(HKEY_CURRENT_USER, SOFTWARE, 0, KEY_READ, hKeySoftware); +ret = RegOpenKeyEx(HKEY_CURRENT_USER, SOFTWARE\\MozillaPlugins\\@sun.com/npsopluginmi;version=1.0, 0, KEY_READ, hLibreOffice); if(ret != ERROR_SUCCESS){ return -1; } -} -ret = RegOpenKeyEx(hKeySoftware, MozillaPlugins, 0, KEY_READ, hMozillaPlugins); -if(ret != ERROR_SUCCESS){ -RegCloseKey(hKeySoftware); -if( ret == ERROR_FILE_NOT_FOUND) -return 1; -else -return -1; -} -ret = RegOpenKeyEx(hMozillaPlugins, @sun.com/npsopluginmi;version=1.0, 0, KEY_READ, hStarOffice); -if(ret != ERROR_SUCCESS){ -RegCloseKey(hKeySoftware); -RegCloseKey(hMozillaPlugins); -if( ret == ERROR_FILE_NOT_FOUND) -return 1; -else -return -1; } if((realFilePath == NULL) || (strlen(realFilePath) == 0) || (strlen(realFilePath) = SO_PATH_SIZE)) @@ -85,7 +66,7 @@ if(ret == 0){ DWORD dType = REG_SZ; DWORD dSize = SO_PATH_SIZE; -ret = RegQueryValueEx (hStarOffice, Path, NULL, dType , (LPBYTE) sPluginPath, dSize); +ret = RegQueryValueEx (hLibreOffice, Path, NULL, dType , (LPBYTE) sPluginPath, dSize); if(ret == ERROR_SUCCESS){ if(strcmp(sPluginPath, sSoPath) == 0) ret = 0; @@ -97,9 +78,7 @@ } else ret = -1; -RegCloseKey(hStarOffice); -RegCloseKey(hMozillaPlugins); -RegCloseKey(hKeySoftware); +RegCloseKey(hLibreOffice); return ret; } -- To view, visit https://gerrit.libreoffice.org/3785 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9ae2a7dae1501500d7ea7cb42517605219450af3 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Andras Timar ati...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Create Photo Album fix
Hello LibreOffice gerrit bot, I'd like you to reexamine a change. Please visit https://gerrit.libreoffice.org/3426 to look at the new patch set (#2). Change subject: Create Photo Album fix .. Create Photo Album fix Fixed some pointer issues in CreateHdl function. Removed the creation of title slide. Added an enum to access the image layout option from the code. Change-Id: Ib91fbbf3b068453c8e66b8df1ce32e24c3828bc0 --- M sd/source/ui/app/strings.src M sd/source/ui/dlg/PhotoAlbumDialog.cxx M sd/source/ui/dlg/PhotoAlbumDialog.hxx M sd/source/ui/inc/strings.hrc 4 files changed, 43 insertions(+), 64 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/26/3426/2 -- To view, visit https://gerrit.libreoffice.org/3426 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ib91fbbf3b068453c8e66b8df1ce32e24c3828bc0 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Gergő Mocsi gmocs...@gmail.com Gerrit-Reviewer: Andras Timar ati...@suse.com Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Create Photo Album fix
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3426 -- To view, visit https://gerrit.libreoffice.org/3426 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib91fbbf3b068453c8e66b8df1ce32e24c3828bc0 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Gergő Mocsi gmocs...@gmail.com Gerrit-Reviewer: Andras Timar ati...@suse.com Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Create Photo Album fix
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3759 Approvals: Andras Timar: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3759 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I879a6394865bb8442c0621dc2789efd9eedae87c Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Gergő Mocsi gmocs...@gmail.com Gerrit-Reviewer: Andras Timar ati...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0] remove defines from npsoplugin resource, that are defined el...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3748 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/48/3748/1 remove defines from npsoplugin resource, that are defined elsewhere Change-Id: I745944202a25a348f36e79d28f03740a28b70eee --- M extensions/WinResTarget_npsoplugin.mk M extensions/source/nsplugin/source/nsplugin_oo.rc 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/extensions/WinResTarget_npsoplugin.mk b/extensions/WinResTarget_npsoplugin.mk index 9db0984..9da0038 100644 --- a/extensions/WinResTarget_npsoplugin.mk +++ b/extensions/WinResTarget_npsoplugin.mk @@ -30,6 +30,11 @@ $(eval $(call gb_WinResTarget_WinResTarget,npsoplugin/npsoplugin)) +$(eval $(call gb_WinResTarget_add_defs,npsoplugin/npsoplugin,\ +-DVERVARIANT=$(BUILD) \ +-DRES_APP_VENDOR=$(OOO_VENDOR) \ +)) + $(eval $(call gb_WinResTarget_set_rcfile,npsoplugin/npsoplugin,extensions/source/nsplugin/source/nsplugin_oo)) # vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/extensions/source/nsplugin/source/nsplugin_oo.rc b/extensions/source/nsplugin/source/nsplugin_oo.rc index d294836..6284abe 100644 --- a/extensions/source/nsplugin/source/nsplugin_oo.rc +++ b/extensions/source/nsplugin/source/nsplugin_oo.rc @@ -28,9 +28,7 @@ VALUE FileOpenName, StarOffice 6.0/7 Spreadsheet|StarOffice 6.0/7 Spreadsheet Template|StarOffice 6.0/7 Drawing|StarOffice 6.0/7 Drawing Template|StarOffice 6.0/7 Presentation|StarOffice 6.0/7 Presentation Template|StarOffice 6.0/7 Formula|StarOffice 6.0/7 Text Document|StarOffice 6.0/7 Master Document|StarOffice 6.0/7 Text Document Template|OpenDocument Text|OpenDocument Text Template|OpenDocument Master Document|HTML Document Template|OpenDocument Spreadsheet|OpenDocument Spreadsheet Template|OpenDocument Drawing|OpenDocument Drawing Template|OpenDocument Presentation|OpenDocument Presentation Template|OpenDocument Formula\0 #define ADDITIONAL_VERINFO2VALUE FileDescription, LibreOffice Plug-in handles all its documents VALUE ProductName, LibreOffice Plug-in VALUE MIMEType, application/vnd.sun.xml.calc|application/vnd.sun.xml.calc.template|application/vnd.sun.xml.draw|application/vnd.sun.xml.draw.template| #define ADDITIONAL_VERINFO3 application/vnd.sun.xml.impress|application/vnd.sun.xml.impress.template|application/vnd.sun.xml.math|application/vnd.sun.xml.writer|application/vnd.sun.xml.writer.global|application/vnd.sun.xml.writer.template|application/vnd.oasis.opendocument.text|application/vnd.oasis.opendocument.text-template|application/vnd.oasis.opendocument.text-master|application/vnd.oasis.opendocument.text-web|application/vnd.oasis.opendocument.spreadsheet|application/vnd.oasis.opendocument.spreadsheet-template|application/vnd.oasis.opendocument.graphics|application/vnd.oasis.opendocument.graphics-template|application/vnd.oasis.opendocument.presentation|application/vnd.oasis.opendocument.presentation-template|application/vnd.oasis.opendocument.formula\0 -#define VERVARIANT 3 #define ORG_NAME npsoplugin.dll -#define RES_APP_VENDOR #define INTERNAL_NAME npsoplugin #include windows.h -- To view, visit https://gerrit.libreoffice.org/3748 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I745944202a25a348f36e79d28f03740a28b70eee Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Andras Timar ati...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0] remove unsupported binfilter types from npsoplugin
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3749 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/49/3749/1 remove unsupported binfilter types from npsoplugin Change-Id: Ifd12d4d1f4dab0a6bea4701d0a1b9ab4f3763ce7 --- M extensions/source/nsplugin/source/npshell.cxx 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/extensions/source/nsplugin/source/npshell.cxx b/extensions/source/nsplugin/source/npshell.cxx index cba9139..133e00b 100644 --- a/extensions/source/nsplugin/source/npshell.cxx +++ b/extensions/source/nsplugin/source/npshell.cxx @@ -338,16 +338,7 @@ extern C { -char* pMimeTypes = const_cast char* ( application/vnd.stardivision.calc:sdc:StarCalc 3.0 - 5.0; -application/vnd.stardivision.chart:sds:StarChart 3.0 - 5.0; -application/vnd.stardivision.draw:sda:StarDraw 3.0 - 5.0; -application/vnd.stardivision.impress:sdd:StarImpress 3.0 - 5.0; -application/vnd.stardivision.impress-packed:sdp:StarImpress-packed 3.0 - 5.0; -application/vnd.stardivision.math:smf:StarMath 3.0 - 5.0; -application/vnd.stardivision.writer:vor:StarWriter Template 3.0 - 5.0; -application/vnd.stardivision.writer-global:sgl:StarWriter Global 3.0 - 5.0; -application/vnd.staroffice.writer:sdw:StarWriter 3.0 - 5.0; -application/msword:doc:MS Word document; +char* pMimeTypes = const_cast char* ( application/msword:doc:MS Word document; application/msword:dot:MS Word document template; application/vnd.ms-excel:xls:MS Excel spreadsheet; application/vnd.ms-excel:xlt:MS Excel spreadsheet template; -- To view, visit https://gerrit.libreoffice.org/3749 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifd12d4d1f4dab0a6bea4701d0a1b9ab4f3763ce7 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Andras Timar ati...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0] fdo#54087 link the correct resource file to npsoplugin.dll
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3746 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/46/3746/1 fdo#54087 link the correct resource file to npsoplugin.dll I had to add a new function to gbuild system: set_nativeres, because the trick in extensions/Library_npsoplugin.mk did not work. It linked the default.res, and that made the plugin unusable under Windows. Also, one export was missing compared to LibreOffice 3.5. Change-Id: Ib91fa2a3b72b15912587f22becccb0aebc2aa390 --- M extensions/Library_npsoplugin.mk M extensions/WinResTarget_npsoplugin.mk M solenv/gbuild/Library.mk M solenv/gbuild/platform/WNT_INTEL_GCC.mk M solenv/gbuild/platform/com_MSC_class.mk 5 files changed, 18 insertions(+), 8 deletions(-) diff --git a/extensions/Library_npsoplugin.mk b/extensions/Library_npsoplugin.mk index 31908f6..0ff92e5 100644 --- a/extensions/Library_npsoplugin.mk +++ b/extensions/Library_npsoplugin.mk @@ -95,6 +95,8 @@ ifeq ($(COM),MSC) $(eval $(call gb_Library_add_ldflags,npsoplugin,\ /EXPORT:NPP_GetMIMEDescription \ + /EXPORT:NPP_Initialize \ + /EXPORT:NPP_Shutdown \ /EXPORT:NPP_New \ /EXPORT:NPP_Destroy \ /EXPORT:NPP_SetWindow \ @@ -105,7 +107,6 @@ /EXPORT:NPP_StreamAsFile \ /EXPORT:NPP_URLNotify \ /EXPORT:NPP_Print \ - /EXPORT:NPP_Shutdown \ /EXPORT:NP_GetEntryPoints \ /EXPORT:NP_Initialize \ /EXPORT:NP_Shutdown \ @@ -113,11 +114,7 @@ )) endif -# Trick to get rid of the default.res to avoid duplicate VERSION -# resource: Set NATIVERES for npsoplugin to be *only* npsoplugin_res - -$(eval $(call gb_LinkTarget_get_target,npsoplugin) : $(call gb_WinResTarget_get_target,npsoplugin_res)) -$(eval $(call gb_LinkTarget_get_target,npsoplugin) : NATIVERES := $(call gb_WinResTarget_get_target,npsoplugin_res)) +$(eval $(call gb_Library_set_nativeres,npsoplugin,npsoplugin/npsoplugin)) endif # GUI=WNT diff --git a/extensions/WinResTarget_npsoplugin.mk b/extensions/WinResTarget_npsoplugin.mk index d6b1e95..9db0984 100644 --- a/extensions/WinResTarget_npsoplugin.mk +++ b/extensions/WinResTarget_npsoplugin.mk @@ -28,8 +28,8 @@ # instead of those above. # -$(eval $(call gb_WinResTarget_WinResTarget,npsoplugin_res)) +$(eval $(call gb_WinResTarget_WinResTarget,npsoplugin/npsoplugin)) -$(eval $(call gb_WinResTarget_set_rcfile,npsoplugin_res,extensions/source/nsplugin/source/nsplugin_oo)) +$(eval $(call gb_WinResTarget_set_rcfile,npsoplugin/npsoplugin,extensions/source/nsplugin/source/nsplugin_oo)) # vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk index bb79911..6c9e96e 100644 --- a/solenv/gbuild/Library.mk +++ b/solenv/gbuild/Library.mk @@ -225,6 +225,7 @@ add_sdi_headers \ export_objects_list \ add_nativeres \ + set_nativeres \ set_visibility_default \ set_warnings_not_errors \ set_generated_cxx_suffix \ diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk b/solenv/gbuild/platform/WNT_INTEL_GCC.mk index b9edab0..3f01233 100644 --- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk @@ -293,6 +293,12 @@ endef +define gb_LinkTarget_set_nativeres +$(call gb_LinkTarget_get_target,$(1)) : $(call gb_WinResTarget_get_target,$(2)) +$(call gb_LinkTarget_get_target,$(1)) : NATIVERES := $(call gb_WinResTarget_get_target,$(2)) + +endef + define gb_Library_get_dllname $(patsubst $(1):%,%,$(filter $(1):%,$(gb_Library_DLLFILENAMES))) endef diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk index 72d63af..c965f2b 100644 --- a/solenv/gbuild/platform/com_MSC_class.mk +++ b/solenv/gbuild/platform/com_MSC_class.mk @@ -283,6 +283,12 @@ endef +define gb_LinkTarget_set_nativeres +$(call gb_LinkTarget_get_target,$(1)) : $(call gb_WinResTarget_get_target,$(2)) +$(call gb_LinkTarget_get_target,$(1)) : NATIVERES := $(call gb_WinResTarget_get_target,$(2)) + +endef + define gb_Library_get_dllname $(patsubst $(1):%,%,$(filter $(1):%,$(gb_Library_DLLFILENAMES))) endef -- To view, visit https://gerrit.libreoffice.org/3746 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib91fa2a3b72b15912587f22becccb0aebc2aa390 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Andras Timar ati...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0] remove unsupported binfilter types from npsoplugin
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3747 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/47/3747/1 remove unsupported binfilter types from npsoplugin Change-Id: Ifb23e61b265697272e54df225719e006319e79af --- M extensions/source/nsplugin/source/nsplugin_oo.rc 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/extensions/source/nsplugin/source/nsplugin_oo.rc b/extensions/source/nsplugin/source/nsplugin_oo.rc index ba09335..d294836 100644 --- a/extensions/source/nsplugin/source/nsplugin_oo.rc +++ b/extensions/source/nsplugin/source/nsplugin_oo.rc @@ -24,9 +24,9 @@ * for a copy of the LGPLv3 License. * / -#define ADDITIONAL_VERINFO1 VALUE FileExtents, sdc|sds|sda|sdd|sdp|smf|vor|sgl|sdw|sxc|stc|sxd|std|sxi|sti|sxm|sxw|sxg|stw|odt|ott|odm|oth|ods|ots|odg|otg|odp|otp|odf\0\ -VALUE FileOpenName, StarCalc 3.0 - 5.0|StarChart 3.0 - 5.0|StarDraw 3.0 - 5.0|StarImpress 3.0 - 5.0|StarImpress-packed 3.0 - 5.0|StarMath 3.0 - 5.0|StarWriter Template 3.0 - 5.0|StarWriter Global 3.0 - 5.0|StarWriter 3.0 - 5.0|StarOffice 6.0/7 Spreadsheet|StarOffice 6.0/7 Spreadsheet Template|StarOffice 6.0/7 Drawing|StarOffice 6.0/7 Drawing Template|StarOffice 6.0/7 Presentation|StarOffice 6.0/7 Presentation Template|StarOffice 6.0/7 Formula|StarOffice 6.0/7 Text Document|StarOffice 6.0/7 Master Document|StarOffice 6.0/7 Text Document Template|OpenDocument Text|OpenDocument Text Template|OpenDocument Master Document|HTML Document Template|OpenDocument Spreadsheet|OpenDocument Spreadsheet Template|OpenDocument Drawing|OpenDocument Drawing Template|OpenDocument Presentation|OpenDocument Presentation Template|OpenDocument Formula\0 -#define ADDITIONAL_VERINFO2VALUE FileDescription, LibreOffice Plug-in handles all its documents VALUE ProductName, LibreOffice Plug-in VALUE MIMEType, application/vnd.stardivision.calc|application/vnd.stardivision.chart|application/vnd.stardivision.draw|application/vnd.stardivision.impress|application/vnd.stardivision.impress-packed|application/vnd.stardivision.math|application/vnd.stardivision.writer|application/vnd.stardivision.writer-global|application/vnd.staroffice.writer|application/vnd.sun.xml.calc|application/vnd.sun.xml.calc.template|application/vnd.sun.xml.draw|application/vnd.sun.xml.draw.template| +#define ADDITIONAL_VERINFO1 VALUE FileExtents, sxc|stc|sxd|std|sxi|sti|sxm|sxw|sxg|stw|odt|ott|odm|oth|ods|ots|odg|otg|odp|otp|odf\0\ +VALUE FileOpenName, StarOffice 6.0/7 Spreadsheet|StarOffice 6.0/7 Spreadsheet Template|StarOffice 6.0/7 Drawing|StarOffice 6.0/7 Drawing Template|StarOffice 6.0/7 Presentation|StarOffice 6.0/7 Presentation Template|StarOffice 6.0/7 Formula|StarOffice 6.0/7 Text Document|StarOffice 6.0/7 Master Document|StarOffice 6.0/7 Text Document Template|OpenDocument Text|OpenDocument Text Template|OpenDocument Master Document|HTML Document Template|OpenDocument Spreadsheet|OpenDocument Spreadsheet Template|OpenDocument Drawing|OpenDocument Drawing Template|OpenDocument Presentation|OpenDocument Presentation Template|OpenDocument Formula\0 +#define ADDITIONAL_VERINFO2VALUE FileDescription, LibreOffice Plug-in handles all its documents VALUE ProductName, LibreOffice Plug-in VALUE MIMEType, application/vnd.sun.xml.calc|application/vnd.sun.xml.calc.template|application/vnd.sun.xml.draw|application/vnd.sun.xml.draw.template| #define ADDITIONAL_VERINFO3 application/vnd.sun.xml.impress|application/vnd.sun.xml.impress.template|application/vnd.sun.xml.math|application/vnd.sun.xml.writer|application/vnd.sun.xml.writer.global|application/vnd.sun.xml.writer.template|application/vnd.oasis.opendocument.text|application/vnd.oasis.opendocument.text-template|application/vnd.oasis.opendocument.text-master|application/vnd.oasis.opendocument.text-web|application/vnd.oasis.opendocument.spreadsheet|application/vnd.oasis.opendocument.spreadsheet-template|application/vnd.oasis.opendocument.graphics|application/vnd.oasis.opendocument.graphics-template|application/vnd.oasis.opendocument.presentation|application/vnd.oasis.opendocument.presentation-template|application/vnd.oasis.opendocument.formula\0 #define VERVARIANT 3 #define ORG_NAME npsoplugin.dll -- To view, visit https://gerrit.libreoffice.org/3747 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifb23e61b265697272e54df225719e006319e79af Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Andras Timar ati...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-3-6] fdo#54087 link the correct resource file to npsoplugin.dll
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3750 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/50/3750/1 fdo#54087 link the correct resource file to npsoplugin.dll I had to add a new function to gbuild system: set_nativeres, because the trick in extensions/Library_npsoplugin.mk did not work. It linked the default.res, and that made the plugin unusable under Windows. Also, one export was missing compared to LibreOffice 3.5. Conflicts: solenv/gbuild/Library.mk solenv/gbuild/platform/com_MSC_class.mk Change-Id: Ib91fa2a3b72b15912587f22becccb0aebc2aa390 --- M extensions/Library_npsoplugin.mk M extensions/WinResTarget_npsoplugin.mk M solenv/gbuild/Library.mk M solenv/gbuild/platform/WNT_INTEL_GCC.mk M solenv/gbuild/platform/WNT_INTEL_MSC.mk 5 files changed, 18 insertions(+), 8 deletions(-) diff --git a/extensions/Library_npsoplugin.mk b/extensions/Library_npsoplugin.mk index 2f1d8f6..d6fa74f 100644 --- a/extensions/Library_npsoplugin.mk +++ b/extensions/Library_npsoplugin.mk @@ -94,6 +94,8 @@ ifeq ($(COM),MSC) $(eval $(call gb_Library_add_ldflags,npsoplugin,\ /EXPORT:NPP_GetMIMEDescription \ + /EXPORT:NPP_Initialize \ + /EXPORT:NPP_Shutdown \ /EXPORT:NPP_New \ /EXPORT:NPP_Destroy \ /EXPORT:NPP_SetWindow \ @@ -104,7 +106,6 @@ /EXPORT:NPP_StreamAsFile \ /EXPORT:NPP_URLNotify \ /EXPORT:NPP_Print \ - /EXPORT:NPP_Shutdown \ /EXPORT:NP_GetEntryPoints \ /EXPORT:NP_Initialize \ /EXPORT:NP_Shutdown \ @@ -112,11 +113,7 @@ )) endif -# Trick to get rid of the default.res to avoid duplicate VERSION -# resource: Set NATIVERES for npsoplugin to be *only* npsoplugin_res - -$(eval $(call gb_LinkTarget_get_target,npsoplugin) : $(call gb_WinResTarget_get_target,npsoplugin_res)) -$(eval $(call gb_LinkTarget_get_target,npsoplugin) : NATIVERES := $(call gb_WinResTarget_get_target,npsoplugin_res)) +$(eval $(call gb_Library_set_nativeres,npsoplugin,npsoplugin/npsoplugin)) endif # GUI=WNT diff --git a/extensions/WinResTarget_npsoplugin.mk b/extensions/WinResTarget_npsoplugin.mk index d6b1e95..9db0984 100644 --- a/extensions/WinResTarget_npsoplugin.mk +++ b/extensions/WinResTarget_npsoplugin.mk @@ -28,8 +28,8 @@ # instead of those above. # -$(eval $(call gb_WinResTarget_WinResTarget,npsoplugin_res)) +$(eval $(call gb_WinResTarget_WinResTarget,npsoplugin/npsoplugin)) -$(eval $(call gb_WinResTarget_set_rcfile,npsoplugin_res,extensions/source/nsplugin/source/nsplugin_oo)) +$(eval $(call gb_WinResTarget_set_rcfile,npsoplugin/npsoplugin,extensions/source/nsplugin/source/nsplugin_oo)) # vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk index cb043d0..92e35d2 100644 --- a/solenv/gbuild/Library.mk +++ b/solenv/gbuild/Library.mk @@ -211,6 +211,7 @@ add_sdi_headers \ export_objects_list \ add_nativeres \ + set_nativeres \ set_warnings_not_errors \ ,\ $(call gb_Library__forward_to_Linktarget,$(method))\ diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk b/solenv/gbuild/platform/WNT_INTEL_GCC.mk index 78dac25..0f612b0 100644 --- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk @@ -333,6 +333,12 @@ endef +define gb_LinkTarget_set_nativeres +$(call gb_LinkTarget_get_target,$(1)) : $(call gb_WinResTarget_get_target,$(2)) +$(call gb_LinkTarget_get_target,$(1)) : NATIVERES := $(call gb_WinResTarget_get_target,$(2)) + +endef + define gb_Library_get_dllname $(patsubst $(1):%,%,$(filter $(1):%,$(gb_Library_DLLFILENAMES))) endef diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk index 9cc5a78..7647bad 100644 --- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk @@ -514,6 +514,12 @@ endef +define gb_LinkTarget_set_nativeres +$(call gb_LinkTarget_get_target,$(1)) : $(call gb_WinResTarget_get_target,$(2)) +$(call gb_LinkTarget_get_target,$(1)) : NATIVERES := $(call gb_WinResTarget_get_target,$(2)) + +endef + define gb_Library_get_dllname $(patsubst $(1):%,%,$(filter $(1):%,$(gb_Library_DLLFILENAMES))) endef -- To view, visit https://gerrit.libreoffice.org/3750 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib91fa2a3b72b15912587f22becccb0aebc2aa390 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Andras Timar ati...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] fdo#60641, localise strings
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3441 Approvals: Andras Timar: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3441 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3dfafc90686bea9ddee67262044afa2619b882f8 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Ádám Király kiraly.adam.cs...@gmail.com Gerrit-Reviewer: Andras Timar ati...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Create Photo Album implementation
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3335 -- To view, visit https://gerrit.libreoffice.org/3335 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7eb844bf2382a44481435cfaa8f498e29c56bd69 Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Gergő Mocsi gmocs...@gmail.com Gerrit-Reviewer: Andras Timar ati...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Create Photo Album implementation
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3169 Approvals: Andras Timar: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3169 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I68d2a3e00f8c55b909fe4d98aa3958188653390e Gerrit-PatchSet: 6 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Gergő Mocsi gmocs...@gmail.com Gerrit-Reviewer: Andras Timar ati...@suse.com Gerrit-Reviewer: Thomas Arnhold tho...@arnhold.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Update Swedish autocorrect files.
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3284 Approvals: Andras Timar: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3284 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib7428ff5201ec78b15b9f00039fa7ec61fcc9724 Gerrit-PatchSet: 4 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Niklas Johansson sleeping.pil...@gmail.com Gerrit-Reviewer: Andras Timar ati...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#49120 - Implementig XML_state
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3222 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/22/3222/1 fdo#49120 - Implementig XML_state Change-Id: If4779aeb5301bb3e422ceb6a4029ddf5542ab03d --- M sc/source/filter/excel/xeview.cxx M sc/source/filter/inc/xeview.hxx 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/sc/source/filter/excel/xeview.cxx b/sc/source/filter/excel/xeview.cxx index ba3a095..5ae744f 100644 --- a/sc/source/filter/excel/xeview.cxx +++ b/sc/source/filter/excel/xeview.cxx @@ -165,7 +165,8 @@ mnSplitX( rData.mnSplitX ), mnSplitY( rData.mnSplitY ), maSecondXclPos( rData.maSecondXclPos ), -mnActivePane( rData.mnActivePane ) +mnActivePane( rData.mnActivePane ), +mbFrozenPanes( rData.mbFrozenPanes ) { OSL_ENSURE( rData.IsSplit(), XclExpPane::XclExpPane - no PANE record for unsplit view ); } @@ -189,7 +190,7 @@ XML_ySplit, OString::valueOf( (sal_Int32)mnSplitY ).getStr(), XML_topLeftCell,XclXmlUtils::ToOString( maSecondXclPos ).getStr(), XML_activePane, lcl_GetActivePane( mnActivePane ), -// OOXTODO: XML_state, +XML_state, mbFrozenPanes ? frozen : split, FSEND ); } diff --git a/sc/source/filter/inc/xeview.hxx b/sc/source/filter/inc/xeview.hxx index 07a0b0c..ab53e6d 100644 --- a/sc/source/filter/inc/xeview.hxx +++ b/sc/source/filter/inc/xeview.hxx @@ -103,6 +103,7 @@ sal_uInt32 mnSplitY; /// Split Y position, or frozen row. XclAddress maSecondXclPos; /// First visible cell in additional panes. sal_uInt8 mnActivePane; /// Active pane (with cell cursor). +boolmbFrozenPanes; /// true = frozen panes; false = split window. }; // -- To view, visit https://gerrit.libreoffice.org/3222 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If4779aeb5301bb3e422ceb6a4029ddf5542ab03d Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Andras Timar ati...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Typo in comment in resmgr.hxx
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3220 Approvals: Andras Timar: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3220 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6378c79f77ab897bf5a4e39c00944037beeef328 Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Chris Sherlock chris.sherloc...@gmail.com Gerrit-Reviewer: Andras Timar ati...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0] add more languages to WikiHelp
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3200 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/help refs/changes/00/3200/1 add more languages to WikiHelp Change-Id: I4210f948f464b9f7e4eebe9bf92f9f94ee691d8b --- M help-to-wiki.py 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/help-to-wiki.py b/help-to-wiki.py index 0ee17ba..706e85f 100755 --- a/help-to-wiki.py +++ b/help-to-wiki.py @@ -60,9 +60,10 @@ except: pass -# Langs to handle -langs = ['', 'ca', 'cs', 'da', 'de', 'es', 'fr', 'hu', \ - 'it', 'ja', 'ko', 'nl', 'pl', 'pt', 'pt-BR', 'ru', \ +# Langs to handle (fully translated or otherwise important) +langs = ['', 'ast', 'bg', 'bn', bn_IN', 'ca', 'cs', 'da', 'de', \ + 'el', 'es', 'eu', 'fi', 'fr', 'hu', 'it', 'ja', 'km', \ + 'ko', 'nb', 'nl', 'om', 'pl', 'pt', 'pt-BR', 'ru', \ 'sl', 'sv', 'tr', 'vi', 'zh-CN', 'zh-TW' ] # Argument handling -- To view, visit https://gerrit.libreoffice.org/3200 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4210f948f464b9f7e4eebe9bf92f9f94ee691d8b Gerrit-PatchSet: 1 Gerrit-Project: help Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Andras Timar ati...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0] icon style fixes in local help
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3201 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/01/3201/1 icon style fixes in local help correct icon style in offline help when icon style is Automatic change icon style in offile help when icon style is changed on UI Conflicts: xmlhelp/Library_ucpchelp1.mk Change-Id: I1b56beeaf370cb6b20b9a7c69f158291b4128ab0 --- M xmlhelp/Library_ucpchelp1.mk M xmlhelp/source/cxxhelp/provider/databases.cxx M xmlhelp/source/cxxhelp/provider/databases.hxx 3 files changed, 22 insertions(+), 11 deletions(-) diff --git a/xmlhelp/Library_ucpchelp1.mk b/xmlhelp/Library_ucpchelp1.mk index 23527d1..4749c0d 100644 --- a/xmlhelp/Library_ucpchelp1.mk +++ b/xmlhelp/Library_ucpchelp1.mk @@ -70,6 +70,7 @@ sal \ ucbhelper \ utl \ + vcl \ )) $(eval $(call gb_Library_add_exception_objects,ucpchelp1,\ diff --git a/xmlhelp/source/cxxhelp/provider/databases.cxx b/xmlhelp/source/cxxhelp/provider/databases.cxx index 7eda0aa..38b0ce4 100644 --- a/xmlhelp/source/cxxhelp/provider/databases.cxx +++ b/xmlhelp/source/cxxhelp/provider/databases.cxx @@ -61,6 +61,8 @@ #include comphelper/storagehelper.hxx #include comphelper/string.hxx +#include vcl/svapp.hxx + #include databases.hxx #include urlparameter.hxx @@ -138,7 +140,7 @@ vendVersion( rtl::OUString( %VENDORVERSION ) ), vendShort( rtl::OUString( %VENDORSHORT ) ), m_aImagesZipPaths( imagesZipPaths ), - m_nSymbolsStyle( 0 ) + m_aSymbolsStyleName( ) { m_xSMgr = Reference XMultiComponentFactory ( m_xContext-getServiceManager(), UNO_QUERY ); @@ -238,8 +240,7 @@ rtl::OString Databases::getImagesZipFileURL() { -//sal_Int16 nSymbolsStyle = SvtMiscOptions().GetCurrentSymbolsStyle(); -sal_Int16 nSymbolsStyle = 0; +OUString aSymbolsStyleName; try { uno::Reference lang::XMultiServiceFactory xConfigProvider = @@ -259,22 +260,31 @@ bool bChanged = false; uno::Reference container::XHierarchicalNameAccess xAccess(xCFG, uno::UNO_QUERY_THROW); -uno::Any aResult = xAccess-getByHierarchicalName(::rtl::OUString(Misc/SymbolSet)); -if ( (aResult = nSymbolsStyle) m_nSymbolsStyle != nSymbolsStyle ) +uno::Any aResult = xAccess-getByHierarchicalName(::rtl::OUString(Misc/SymbolStyle)); +if ( (aResult = aSymbolsStyleName) m_aSymbolsStyleName != aSymbolsStyleName ) { -m_nSymbolsStyle = nSymbolsStyle; +m_aSymbolsStyleName = aSymbolsStyleName; bChanged = true; } if ( m_aImagesZipFileURL.isEmpty() || bChanged ) { -rtl::OUString aImageZip, aSymbolsStyleName; -aResult = xAccess-getByHierarchicalName(::rtl::OUString(Misc/SymbolStyle)); -aResult = aSymbolsStyleName; - +rtl::OUString aImageZip; bool bFound = false; + if ( !aSymbolsStyleName.isEmpty() ) { +if ( aSymbolsStyleName.equalsAscii(auto) ) +{ +OUString const env = Application::GetDesktopEnvironment(); +if ( env.equalsIgnoreAsciiCase(tde) || + env.equalsIgnoreAsciiCase(kde) ) +aSymbolsStyleName = crystal; +else if ( env.equalsIgnoreAsciiCase(kde4) ) +aSymbolsStyleName = oxygen; +else +aSymbolsStyleName = tango; +} rtl::OUString aZipName = rtl::OUString( images_ ); aZipName += aSymbolsStyleName; aZipName += rtl::OUString( .zip ); diff --git a/xmlhelp/source/cxxhelp/provider/databases.hxx b/xmlhelp/source/cxxhelp/provider/databases.hxx index 9961cfe..adc826a 100644 --- a/xmlhelp/source/cxxhelp/provider/databases.hxx +++ b/xmlhelp/source/cxxhelp/provider/databases.hxx @@ -314,7 +314,7 @@ rtl::OUString m_aInstallDirectory;// Installation directory com::sun::star::uno::Sequence rtl::OUString m_aImagesZipPaths; rtl::OString m_aImagesZipFileURL; -sal_Int16 m_nSymbolsStyle; +rtl::OUString m_aSymbolsStyleName; std::vector rtl::OUString m_avModules; -- To view, visit https://gerrit.libreoffice.org/3201 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1b56beeaf370cb6b20b9a7c69f158291b4128ab0 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Andras Timar ati...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] writing out tools/fsys.hxx (extensions)
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3119 Approvals: Andras Timar: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3119 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6b2132e7441be1579f6233ec56fdaf8807a60b55 Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Andras Timar ati...@suse.com Gerrit-Reviewer: Andras Timar ati...@suse.com Gerrit-Reviewer: Michael Meeks michael.me...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Fix typo: addtional = additional in the comment.
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3165 Approvals: Andras Timar: Verified; Looks good to me, approved Thomas Arnhold: Looks good to me, but someone else must approve -- To view, visit https://gerrit.libreoffice.org/3165 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7e9e71c721266a0cbc4412024ec49cb689672876 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Golnaz Irannejad golnaziranne...@gmail.com Gerrit-Reviewer: Andras Timar ati...@suse.com Gerrit-Reviewer: Thomas Arnhold tho...@arnhold.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED libreoffice-4-0] Fix debug build
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3168 Approvals: Andras Timar: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3168 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1a4db30f4cc33ee99b48a25db6e6fcd600d00ffd Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Fridrich Strba fridr...@documentfoundation.org Gerrit-Reviewer: Andras Timar ati...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Correct typos in sw README
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3131 Approvals: Andras Timar: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3131 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I61323685b33817a2641713455bac1a079687cb4d Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Chris Sherlock chris.sherloc...@gmail.com Gerrit-Reviewer: Andras Timar ati...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Lightproof and Hunspell updates for pt-BR
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3130 Approvals: Andras Timar: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3130 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iaf871e4ad7de5c51ed55674b742b8f2b20070001 Gerrit-PatchSet: 3 Gerrit-Project: dictionaries Gerrit-Branch: master Gerrit-Owner: Olivier Hallot olivier.hal...@edx.srv.br Gerrit-Reviewer: Andras Timar ati...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Serbian dictionary updated to 2013.03.30
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3120 Approvals: Andras Timar: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3120 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia3b99deff58bd5f4198f1fd57ea3a540f15d2708 Gerrit-PatchSet: 4 Gerrit-Project: dictionaries Gerrit-Branch: master Gerrit-Owner: Goran Rakic gra...@devbase.net Gerrit-Reviewer: Andras Timar ati...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] writing out tools/fsys.hxx (extensions)
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3119 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/19/3119/1 writing out tools/fsys.hxx (extensions) Change-Id: I6b2132e7441be1579f6233ec56fdaf8807a60b55 --- M extensions/source/plugin/base/context.cxx M extensions/source/plugin/base/plcom.cxx M extensions/source/plugin/base/xplugin.cxx 3 files changed, 30 insertions(+), 31 deletions(-) diff --git a/extensions/source/plugin/base/context.cxx b/extensions/source/plugin/base/context.cxx index a499201..61bf607 100644 --- a/extensions/source/plugin/base/context.cxx +++ b/extensions/source/plugin/base/context.cxx @@ -48,8 +48,8 @@ #include com/sun/star/frame/FrameSearchFlag.hpp #include com/sun/star/frame/XComponentLoader.hpp #include com/sun/star/frame/Desktop.hpp -#include tools/fsys.hxx #include tools/urlobj.hxx +#include osl/file.hxx #include cppuhelper/implbase1.hxx @@ -215,7 +215,7 @@ aStream.Seek( STREAM_SEEK_TO_BEGIN ); aStream.Read( aBuf.getArray(), nBytes ); aStream.Close(); -DirEntry( aFileName ).Kill(); +osl::File::remove( aFileName ); } } @@ -278,9 +278,8 @@ m_aMIMEType( mimetype ), m_aTarget( target ) { -DirEntry aEntry; -m_aFileName = aEntry.TempName().GetFull(); -::rtl::OString aFile = ::rtl::OUStringToOString( m_aFileName, osl_getThreadTextEncoding() ); +osl::FileBase::createTempFile( 0, 0, m_aFileName ); +OString aFile = OUStringToOString( m_aFileName, osl_getThreadTextEncoding() ); fp = fopen( aFile.getStr() , wb ); Reference ::com::sun::star::io::XActiveDataControl xControl( source, UNO_QUERY ); @@ -292,8 +291,7 @@ FileSink::~FileSink() { -DirEntry aEntry( m_aFileName ); -aEntry.Kill(); +osl::File::remove( m_aFileName ); } void FileSink::closeOutput() throw() diff --git a/extensions/source/plugin/base/plcom.cxx b/extensions/source/plugin/base/plcom.cxx index 4239c85..11fc4e3 100644 --- a/extensions/source/plugin/base/plcom.cxx +++ b/extensions/source/plugin/base/plcom.cxx @@ -45,7 +45,7 @@ #include cstdarg -#include tools/fsys.hxx +#include osl/file.hxx #include plugin/impl.hxx PluginComm::PluginComm( const ::rtl::OString rLibName, bool bReusable ) : @@ -61,10 +61,10 @@ PluginManager::get().getPluginComms().remove( this ); while( m_aFilesToDelete.size() ) { -String aFile = m_aFilesToDelete.front(); +OUString aFile( m_aFilesToDelete.front() ); m_aFilesToDelete.pop_front(); -DirEntry aEntry( aFile ); -aEntry.Kill(); +osl::FileBase::getFileURLFromSystemPath( aFile, aFile ); +osl::File::remove( aFile ); } } diff --git a/extensions/source/plugin/base/xplugin.cxx b/extensions/source/plugin/base/xplugin.cxx index 24fa2c7..5e96bee 100644 --- a/extensions/source/plugin/base/xplugin.cxx +++ b/extensions/source/plugin/base/xplugin.cxx @@ -45,7 +45,6 @@ #include comphelper/processfactory.hxx #include plugin/impl.hxx -#include tools/fsys.hxx #include ucbhelper/content.hxx #include tools/urlobj.hxx #include tools/string.hxx @@ -67,9 +66,6 @@ using namespace com::sun::star::beans; using namespace com::sun::star::plugin; using namespace osl; - -using ::rtl::OUString; -using ::rtl::OString; class PluginDisposer : public salhelper::Timer { @@ -99,8 +95,6 @@ else release(); } - -//== Any XPlugin_Impl::queryInterface( const Type type ) throw( RuntimeException ) { @@ -964,20 +958,27 @@ Guard Mutex aGuard( m_pPlugin-getMutex() ); m_pPlugin-getInputStreams().push_back( this ); -DirEntry aEntry; -aEntry = aEntry.TempName(); +OUString aTmpFile; +osl::FileBase::createTempFile( 0, 0, aTmpFile ); // set correct extension, some plugins need that -DirEntry aName( String( m_aNPStream.url, m_pPlugin-getTextEncoding() ) ); -String aExtension = aName.GetExtension(); -if( aExtension.Len() ) -aEntry.SetExtension( aExtension ); -m_aFileStream.Open( aEntry.GetFull(), STREAM_READ | STREAM_WRITE ); +OUString aName( m_aNPStream.url, strlen( m_aNPStream.url ), m_pPlugin-getTextEncoding() ); +OUString aExtension; +sal_Int32 nSepInd = aName.lastIndexOf(.); +if( nSepInd != -1 ) +{ + aExtension = aName.copy( nSepInd + 1, aName.getLength() - nSepInd - 1 ); +} +if( !aExtension.isEmpty() ) +{ +aTmpFile += aExtension; +} +m_aFileStream.Open( aTmpFile, STREAM_READ | STREAM_WRITE ); if( ! m_aFileStream.IsOpen() ) { -// #74808# might be that the extension scrambled the whole filename -aEntry = aEntry.TempName(); -m_aFileStream.Open( aEntry.GetFull(), STREAM_READ | STREAM_WRITE ); +// might be that the extension scrambled the whole
[PATCH libreoffice-4-0] stop uninitialized memory leaking into resource files.
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/3080 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/80/3080/1 stop uninitialized memory leaking into resource files. Change-Id: I8659426dd4ea0c13c8ed839ef5cfb686e6648042 --- M rsc/source/tools/rsctools.cxx 1 file changed, 3 insertions(+), 0 deletions(-) diff --git a/rsc/source/tools/rsctools.cxx b/rsc/source/tools/rsctools.cxx index 02507cc..a9dfb1b 100644 --- a/rsc/source/tools/rsctools.cxx +++ b/rsc/source/tools/rsctools.cxx @@ -377,7 +377,10 @@ char * RscWriteRc :: GetPointer( sal_uInt32 nSize ) { if( !pMem ) +{ pMem = (char *)rtl_allocateMemory( nLen ); +memset( pMem, 0, nLen ); +} return( pMem + nSize ); } -- To view, visit https://gerrit.libreoffice.org/3080 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8659426dd4ea0c13c8ed839ef5cfb686e6648042 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Andras Timar ati...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#39445 writing out tools/fsys.hxx (idl)
Hello LibreOffice gerrit bot, I'd like you to reexamine a change. Please visit https://gerrit.libreoffice.org/2935 to look at the new patch set (#4). Change subject: fdo#39445 writing out tools/fsys.hxx (idl) .. fdo#39445 writing out tools/fsys.hxx (idl) Removed uses of fsys from database.cxx, command.cxx, module.cxx, svidl.cxx. Also removed a lot of cruft from svidl.cxx and command.hxx; unused variables and code relating to them, eg. variables aCxxFile, aHxxFile, aSrcFile, aODLFile. Changed some Strings to OUStrings in svidl.cxx and command.hxx. Change-Id: I708284f70435c8f65cdcfc954af43976e28b8c9d --- M idl/inc/command.hxx M idl/source/objects/module.cxx M idl/source/prj/command.cxx M idl/source/prj/database.cxx M idl/source/prj/svidl.cxx 5 files changed, 137 insertions(+), 159 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/35/2935/4 -- To view, visit https://gerrit.libreoffice.org/2935 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I708284f70435c8f65cdcfc954af43976e28b8c9d Gerrit-PatchSet: 4 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Krisztian Pinter pin.termina...@gmail.com Gerrit-Reviewer: Andras Timar ati...@suse.com Gerrit-Reviewer: Krisztian Pinter pin.termina...@gmail.com Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] fdo#39445 writing out tools/fsys.hxx (idl)
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2935 Approvals: Andras Timar: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2935 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I708284f70435c8f65cdcfc954af43976e28b8c9d Gerrit-PatchSet: 5 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Krisztian Pinter pin.termina...@gmail.com Gerrit-Reviewer: Andras Timar ati...@suse.com Gerrit-Reviewer: Krisztian Pinter pin.termina...@gmail.com Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] fdo#60780, Save a Copy wip
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2829 -- To view, visit https://gerrit.libreoffice.org/2829 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4d7fc9ebc91c2129e8d8dcf9978c324bdddae129 Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Ádám Király kiraly.adam.cs...@gmail.com Gerrit-Reviewer: Andras Timar ati...@suse.com Gerrit-Reviewer: Noel Power noel.po...@suse.com Gerrit-Reviewer: Ádám Király kiraly.adam.cs...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Clean obsolete tools/filesystem abstraction
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2968 Approvals: Andras Timar: Verified; Looks good to me, approved Thomas Arnhold: Looks good to me, but someone else must approve -- To view, visit https://gerrit.libreoffice.org/2968 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I74f99c48b822644b26486a66d2f15386991154d6 Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Tomáš Turek osm...@gmail.com Gerrit-Reviewer: Andras Timar ati...@suse.com Gerrit-Reviewer: Thomas Arnhold tho...@arnhold.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#39445 writing out tools/fsys.hxx (idl)
Hello LibreOffice gerrit bot, I'd like you to reexamine a rebased change. Please visit https://gerrit.libreoffice.org/2935 to look at the new rebased patch set (#3). Change subject: fdo#39445 writing out tools/fsys.hxx (idl) .. fdo#39445 writing out tools/fsys.hxx (idl) Removed uses of fsys from database.cxx, command.cxx, module.cxx, svidl.cxx. Also removed a lot of cruft from svidl.cxx and command.hxx; unused variables and code relating to them, eg. variables aCxxFile, aHxxFile, aSrcFile, aODLFile. Changed some Strings to OUStrings in svidl.cxx and command.hxx. Someone please test this patch under Windows. Change-Id: I708284f70435c8f65cdcfc954af43976e28b8c9d --- M idl/inc/command.hxx M idl/source/objects/module.cxx M idl/source/prj/command.cxx M idl/source/prj/database.cxx M idl/source/prj/svidl.cxx 5 files changed, 138 insertions(+), 159 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/35/2935/3 -- To view, visit https://gerrit.libreoffice.org/2935 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I708284f70435c8f65cdcfc954af43976e28b8c9d Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Krisztian Pinter pin.termina...@gmail.com Gerrit-Reviewer: Andras Timar ati...@suse.com Gerrit-Reviewer: Krisztian Pinter pin.termina...@gmail.com Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] officecfg: remove translated strings
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2905 Approvals: Andras Timar: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2905 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie8d5e04556dc73213e972969d7dd7461799cd396 Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Thomas Arnhold tho...@arnhold.org Gerrit-Reviewer: Andras Timar ati...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] fdo#35546, implementing 'Create Photo Album' function
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2582 Approvals: Andras Timar: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2582 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I14b337187dc5d373fcd28489098fda813b5fd5f6 Gerrit-PatchSet: 16 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Gergő Mocsi gmocs...@gmail.com Gerrit-Reviewer: Andras Timar ati...@suse.com Gerrit-Reviewer: Caolán McNamara caol...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] converted cui/source/options/optsave.src to .ui
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2816 Approvals: Andras Timar: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2816 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ieaef10684f45dc699e7d2c56dffca5483f0a30cc Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Krisztian Pinter pin.termina...@gmail.com Gerrit-Reviewer: Andras Timar ati...@suse.com Gerrit-Reviewer: Jack Leigh leigh...@gmx.se Gerrit-Reviewer: Krisztian Pinter pin.termina...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] handle the empty URL case in file picker
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2390 Approvals: Andras Timar: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2390 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Icf71142411a79e1fe2d1d5918d2a400b174acc00 Gerrit-PatchSet: 5 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Gergő Mocsi gmocs...@gmail.com Gerrit-Reviewer: Andras Timar ati...@suse.com Gerrit-Reviewer: Chris Sherlock chris.sherloc...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[ABANDONED] fdo#46808, Adapt UNO services to the new style, Part 1
Andras Timar has abandoned this change. Change subject: fdo#46808, Adapt UNO services to the new style, Part 1 .. Patch Set 1: Abandoned -- To view, visit https://gerrit.libreoffice.org/2145 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: Ic44fc44d3c52ccc8db5d0b0917cb98ebae061eae Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Gergő Mocsi gmocs...@gmail.com Gerrit-Reviewer: Stephan Bergmann sberg...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] fdo#39445 writing out tools/fsys.hxx (basic)
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2848 Approvals: Andras Timar: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2848 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0d8c64b6498cf5b16757edaf13e1108f279934dd Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Krisztian Pinter pin.termina...@gmail.com Gerrit-Reviewer: Andras Timar ati...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[ABANDONED] odk: fix IDL documentation:
Andras Timar has abandoned this change. Change subject: odk: fix IDL documentation: .. Patch Set 1: Abandoned pushed here by mistake -- To view, visit https://gerrit.libreoffice.org/2850 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: Ia548ab412178efc2acb87f0f4d4ae1854d0b4bfa Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Andras Timar ati...@suse.com Gerrit-Reviewer: Michael Stahl mst...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED libreoffice-4-0] remove trailing whitespace
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2739 Approvals: Andras Timar: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2739 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6834a3235ae2334a0d6f7df0f97dcde7cdc6a5d0 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Björn Michaelsen bjoern.michael...@canonical.com Gerrit-Reviewer: Andras Timar ati...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] fdo#39445 writing out tools/fsys.hxx
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2680 Approvals: Andras Timar: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2680 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ifd57d73847ff271bcb64b12a26a564acc051fcef Gerrit-PatchSet: 4 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Krisztian Pinter pin.termina...@gmail.com Gerrit-Reviewer: Andras Timar ati...@suse.com Gerrit-Reviewer: Jan Holesovsky ke...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[ABANDONED] fdo#46808, Adapt UNO services to new style, Part 1
Andras Timar has abandoned this change. Change subject: fdo#46808, Adapt UNO services to new style, Part 1 .. Patch Set 2: Abandoned -- To view, visit https://gerrit.libreoffice.org/2132 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I4d512d74542285e0a7321f8251193bf33dfb878b Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Gergő Mocsi gmocs...@gmail.com Gerrit-Reviewer: Stephan Bergmann sberg...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0] fdo#62103 only dict of the first lang code is packed into la...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/2656 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/56/2656/1 fdo#62103 only dict of the first lang code is packed into langpack Therefore we packed Aragonese dictionary into Spanish and Catalan langpacks, instead of Spanish and Catalan dictionaries. Change-Id: I6b7606b8d8f4f30cded583b96d9f9b5f2ef64e9f --- M setup_native/source/packinfo/spellchecker_selection.txt 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup_native/source/packinfo/spellchecker_selection.txt b/setup_native/source/packinfo/spellchecker_selection.txt index 0876bc0..6593a64 100644 --- a/setup_native/source/packinfo/spellchecker_selection.txt +++ b/setup_native/source/packinfo/spellchecker_selection.txt @@ -33,7 +33,7 @@ bn = bn br = br,fr bs = bs -ca = an,ca,es,fr,it,oc +ca = ca,an,es,fr,it,oc cs = cs da = da,de de = de,fr,it @@ -41,7 +41,7 @@ en-US = en,es,fr en-GB = en,es,fr en-ZA = en,es,fr -es = an,ca,es,fr,gl,oc,pt-PT +es = es,an,ca,fr,gl,oc,pt-PT et = et fr = fr,es gd = gd -- To view, visit https://gerrit.libreoffice.org/2656 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6b7606b8d8f4f30cded583b96d9f9b5f2ef64e9f Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Andras Timar ati...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-3-6] fdo#62103 only dict of the first lang code is packed into la...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/2657 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/57/2657/1 fdo#62103 only dict of the first lang code is packed into langpack Therefore we packed Aragonese dictionary into Spanish and Catalan langpacks, instead of Spanish and Catalan dictionaries. Conflicts: setup_native/source/packinfo/spellchecker_selection.txt Change-Id: I6b7606b8d8f4f30cded583b96d9f9b5f2ef64e9f --- M setup_native/source/packinfo/spellchecker_selection.txt 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup_native/source/packinfo/spellchecker_selection.txt b/setup_native/source/packinfo/spellchecker_selection.txt index f80e5d5..4844129 100644 --- a/setup_native/source/packinfo/spellchecker_selection.txt +++ b/setup_native/source/packinfo/spellchecker_selection.txt @@ -14,7 +14,7 @@ bg = bg bn = bn br = br,fr -ca = ca,es,fr +ca = ca,an,es,fr,it,oc cs = cs da = da,de de = de,fr,it @@ -22,7 +22,7 @@ en-US = en,es,fr en-GB = en,es,fr en-ZA = en,es,fr -es = an,es,fr,pt-PT +es = es,an,ca,fr,gl,oc,pt-PT et = et fr = fr,es gd = gd -- To view, visit https://gerrit.libreoffice.org/2657 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6b7606b8d8f4f30cded583b96d9f9b5f2ef64e9f Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Andras Timar ati...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] remove ScpConvertTarget class, no codepage conversion is nee...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/2555 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/55/2555/1 remove ScpConvertTarget class, no codepage conversion is needed Change-Id: I45f309c6c23704af8638003fd54f1a7e45062d61 --- M solenv/gbuild/InstallModuleTarget.mk M solenv/gbuild/TargetLocations.mk M solenv/gbuild/platform/IOS_ARM_GCC.mk M solenv/gbuild/platform/WNT_INTEL_GCC.mk M solenv/gbuild/platform/com_MSC_class.mk M solenv/gbuild/platform/macosx.mk M solenv/gbuild/platform/solaris.mk M solenv/gbuild/platform/unxgcc.mk 8 files changed, 5 insertions(+), 76 deletions(-) diff --git a/solenv/gbuild/InstallModuleTarget.mk b/solenv/gbuild/InstallModuleTarget.mk index dbdd1d7..bed84ad 100644 --- a/solenv/gbuild/InstallModuleTarget.mk +++ b/solenv/gbuild/InstallModuleTarget.mk @@ -150,43 +150,6 @@ endef -# ScpConvertTarget class - -# platform: -# gb_ScpConvertTarget_ScpConvertTarget_platform - -gb_ScpConvertTarget_DEPS := $(call gb_Executable_get_runtime_dependencies,ulfconv) -gb_ScpConvertTarget_COMMAND := $(call gb_Executable_get_command,ulfconv) - -define gb_ScpConvertTarget__command -$(call gb_Output_announce,$(2),$(true),SCC,1) -$(call gb_Helper_abbreviate_dirs,\ - $(gb_ScpConvertTarget_COMMAND) $(SCP_FLAGS) -o $(1) $(SCP_CONVERT_ULF) \ -) -endef - -$(dir $(call gb_ScpConvertTarget_get_target,%))%/.dir : - $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@)) - -$(call gb_ScpConvertTarget_get_target,%) : $(gb_ScpConvertTarget_DEPS) - $(call gb_ScpConvertTarget__command,$@,$*) - -.PHONY : $(call gb_ScpConvertTarget_get_clean_target,%) -$(call gb_ScpConvertTarget_get_clean_target,%) : - $(call gb_Output_announce,$*,$(false),SCC,1) - rm -f $(call gb_ScpConvertTarget_get_target,$*) - -# gb_ScpConvertTarget_ScpConvertTarget(target,ulffile) -define gb_ScpConvertTarget_ScpConvertTarget -$(call gb_ScpConvertTarget_get_target,$(1)) : $(2) -$(call gb_ScpConvertTarget_get_target,$(1)) :| $(dir $(call gb_ScpConvertTarget_get_target,$(1))).dir -$(call gb_ScpConvertTarget_get_target,$(1)) : SCP_CONVERT_ULF := $(2) -$(call gb_ScpConvertTarget_get_target,$(1)) : SCP_FLAGS := - -$(call gb_ScpConvertTarget_ScpConvertTarget_platform,$(1)) - -endef - # ScpTarget class gb_ScpTarget_TARGET := $(SOLARENV)/bin/pre2par.pl @@ -232,15 +195,15 @@ define gb_ScpTarget_set_localized ifneq ($(gb_WITH_LANG),) $(call gb_ScpMergeTarget_ScpMergeTarget,$(1)) -$(call gb_ScpConvertTarget_ScpConvertTarget,$(1),$(call gb_ScpMergeTarget_get_target,$(1))) +$(call gb_ScpMergeTarget_ScpMergeTarget,$(1),$(call gb_ScpMergeTarget_get_target,$(1))) $(call gb_ScpTarget_get_clean_target,$(1)) : $(call gb_ScpMergeTarget_get_clean_target,$(1)) else -$(call gb_ScpConvertTarget_ScpConvertTarget,$(1),$(call gb_ScpMergeTarget_get_source,$(1))) +$(call gb_ScpMergeTarget_ScpMergeTarget,$(1),$(call gb_ScpMergeTarget_get_source,$(1))) endif -$(call gb_ScpTarget_get_target,$(1)) : $(call gb_ScpConvertTarget_get_target,$(1)) -$(call gb_ScpTarget_get_clean_target,$(1)) : $(call gb_ScpConvertTarget_get_clean_target,$(1)) -$(call gb_ScpTarget_get_target,$(1)) : SCP_ULF := $(call gb_ScpConvertTarget_get_target,$(1)) +$(call gb_ScpTarget_get_target,$(1)) : $(call gb_ScpMergeTarget_get_target,$(1)) +$(call gb_ScpTarget_get_clean_target,$(1)) : $(call gb_ScpMergeTarget_get_clean_target,$(1)) +$(call gb_ScpTarget_get_target,$(1)) : SCP_ULF := $(call gb_ScpMergeTarget_get_target,$(1)) endef diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk index b46070e..6fa782b 100644 --- a/solenv/gbuild/TargetLocations.mk +++ b/solenv/gbuild/TargetLocations.mk @@ -176,7 +176,6 @@ gb_Rdb_get_target = $(WORKDIR)/Rdb/$(1).rdb gb_ResTarget_get_imagelist_target = $(WORKDIR)/ResTarget/$(1).ilst gb_ResTarget_get_target = $(WORKDIR)/ResTarget/$(1).res -gb_ScpConvertTarget_get_target = $(WORKDIR)/ScpConvertTarget/$(1).ulf gb_ScpMergeTarget_get_target = $(WORKDIR)/ScpMergeTarget/$(1).ulf gb_ScpPreprocessTarget_get_target = $(WORKDIR)/ScpPreprocessTarget/$(1).pre gb_ScpTarget_get_external_target = $(WORKDIR)/ScpTarget/$(1).external @@ -292,7 +291,6 @@ Pyuno \ Rdb \ ResTarget \ - ScpConvertTarget \ ScpMergeTarget \ ScpPreprocessTarget \ ScpTarget \ diff --git a/solenv/gbuild/platform/IOS_ARM_GCC.mk b/solenv/gbuild/platform/IOS_ARM_GCC.mk index 3d14f54..e29a9bf 100644 --- a/solenv/gbuild/platform/IOS_ARM_GCC.mk +++ b/solenv/gbuild/platform/IOS_ARM_GCC.mk @@ -259,10 +259,6 @@ endef -# ScpConvertTarget class - -gb_ScpConvertTarget_ScpConvertTarget_platform := - # InstallScript class gb_InstallScript_EXT := .ins diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk b/solenv/gbuild/platform/WNT_INTEL_GCC.mk index 5b5c21e..b70e84b 100644 --- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk @@ -394,14 +394,6 @@ endef -#
[PUSHED] do not require cygwin gcc
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2521 Approvals: Andras Timar: Verified; Looks good to me, approved Michael Meeks: Looks good to me, but someone else must approve -- To view, visit https://gerrit.libreoffice.org/2521 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I29de91f2eeb5c9317271aecf861f64a3c8eff73f Gerrit-PatchSet: 4 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Peter Foley pefol...@verizon.net Gerrit-Reviewer: Andras Timar ati...@suse.com Gerrit-Reviewer: Michael Meeks michael.me...@suse.com Gerrit-Reviewer: Peter Foley pefol...@verizon.net ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] fdo#38838, replace String with OUString
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2493 Approvals: Andras Timar: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2493 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I84e49275ffc8627e93f32ae522c621d39a4eda72 Gerrit-PatchSet: 4 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Ádám Király kiraly.adam.cs...@gmail.com Gerrit-Reviewer: Andras Timar ati...@suse.com Gerrit-Reviewer: Eike Rathke er...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] fdo#38838, change String to OUString
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2497 Approvals: Andras Timar: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2497 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I373f5d2f453dff83141a4cdaeed94ce0268bf70c Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Ádám Király kiraly.adam.cs...@gmail.com Gerrit-Reviewer: Andras Timar ati...@suse.com Gerrit-Reviewer: Eike Rathke er...@redhat.com Gerrit-Reviewer: Muthu Subramanian K muthus...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#61602 use the new Turkish Lira sign
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/2482 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/82/2482/1 fdo#61602 use the new Turkish Lira sign Change-Id: Ic07d9147ad559573e4e6a3818ee78b8dfcedf12f --- M i18npool/source/localedata/data/tr_TR.xml 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/i18npool/source/localedata/data/tr_TR.xml b/i18npool/source/localedata/data/tr_TR.xml index 8cf411b..b13ce5d 100644 --- a/i18npool/source/localedata/data/tr_TR.xml +++ b/i18npool/source/localedata/data/tr_TR.xml @@ -88,22 +88,22 @@ FormatCode0,00%/FormatCode /FormatElement FormatElement msgid=CurrencyFormatskey1 default=true type=short usage=CURRENCY formatindex=12 - FormatCode#.##0[$TL-41F];-#.##0[$TL-41F]/FormatCode + FormatCode#.##0[$₺-41F];-#.##0[$₺-41F]/FormatCode /FormatElement FormatElement msgid=CurrencyFormatskey2 default=false type=medium usage=CURRENCY formatindex=13 - FormatCode#.##0,00[$TL-41F];-#.##0,00[$TL-41F]/FormatCode + FormatCode#.##0,00[$₺-41F];-#.##0,00[$₺-41F]/FormatCode /FormatElement FormatElement msgid=CurrencyFormatskey3 default=false type=medium usage=CURRENCY formatindex=14 - FormatCode#.##0[$TL-41F];[RED]-#.##0[$TL-41F]/FormatCode + FormatCode#.##0[$₺-41F];[RED]-#.##0[$₺-41F]/FormatCode /FormatElement FormatElement msgid=CurrencyFormatskey4 default=true type=medium usage=CURRENCY formatindex=15 - FormatCode#.##0,00[$TL-41F];[RED]-#.##0,00[$TL-41F]/FormatCode + FormatCode#.##0,00[$₺-41F];[RED]-#.##0,00[$₺-41F]/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#.##0,--[$TL-41F];[RED]-#.##0,--[$TL-41F]/FormatCode + FormatCode#.##0,--[$₺-41F];[RED]-#.##0,--[$₺-41F]/FormatCode /FormatElement FormatElement msgid=DateFormatskey1 default=true type=short usage=DATE formatindex=18 FormatCodeDD.MM.YY/FormatCode @@ -341,7 +341,7 @@ LC_CURRENCY Currency default=true usedInCompatibleFormatCodes=true CurrencyIDTRY/CurrencyID - CurrencySymbolTL/CurrencySymbol + CurrencySymbol₺/CurrencySymbol BankSymbolTRY/BankSymbol CurrencyNameTürk Lirası/CurrencyName DecimalPlaces2/DecimalPlaces -- To view, visit https://gerrit.libreoffice.org/2482 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic07d9147ad559573e4e6a3818ee78b8dfcedf12f Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Andras Timar ati...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[ABANDONED] not working, throws exception in config menu when trying to ...
Andras Timar has abandoned this change. Change subject: not working, throws exception in config menu when trying to write config key .. Patch Set 1: Abandoned Krisztian will send a new patch soon (2 patch merged into 1 plus corrections) -- To view, visit https://gerrit.libreoffice.org/2481 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I2da740eeba796d630c58d209a3d685650096a206 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Krisztian Pinter pin.termina...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[ABANDONED] autosave feature progress
Andras Timar has abandoned this change. Change subject: autosave feature progress .. Patch Set 1: Abandoned Krisztian will send a new patch soon (2 patch merged into 1 plus corrections) -- To view, visit https://gerrit.libreoffice.org/2480 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I58e4d2e9d017ad6d6d0fda21c68447373dab12d4 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Krisztian Pinter pin.termina...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Replace rtl::O(U)String with O(U)String
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2475 Approvals: Andras Timar: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2475 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I67a5952afd305adeb07f728c9074620ecba8e9fc Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Ádám Király kiraly.adam.cs...@gmail.com Gerrit-Reviewer: Andras Timar ati...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-3-6] fdo#61660 unhelpful dictionary entries
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/2488 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/dictionaries refs/changes/88/2488/1 fdo#61660 unhelpful dictionary entries * do not suggest the word 'tranny' ever * add NOSUGGEST support to en_ZA dictionary * accept the word trans as in trans-woman, trans-man, etc. Change-Id: I3f3f21402eb0d74b486c60939a8eba21e935be46 --- M dictionaries/en/en_AU.dic M dictionaries/en/en_GB.aff M dictionaries/en/en_GB.dic M dictionaries/en/en_ZA.aff M dictionaries/en/en_ZA.dic 5 files changed, 18 insertions(+), 13 deletions(-) diff --git a/dictionaries/en/en_AU.dic b/dictionaries/en/en_AU.dic index f91fcec..7eeb40a 100644 --- a/dictionaries/en/en_AU.dic +++ b/dictionaries/en/en_AU.dic @@ -1,4 +1,4 @@ -49844 +49845 1st 2 2nd @@ -38914,9 +38914,10 @@ trampler's tramway/SM Tranmere -tranny/S +tranny/S! tranquillity/S tranquilly/qQs +trans transceiver/SM transcendentalism/SM transcriptional @@ -40890,7 +40891,7 @@ bullied/M bullion/SM bullpen/SM -bullshit/RGSDM +bullshit/RGSDM! bullying/M bum/TDGRSM bumble/RMSkDG diff --git a/dictionaries/en/en_GB.aff b/dictionaries/en/en_GB.aff index cca9a79..4fff89e 100644 --- a/dictionaries/en/en_GB.aff +++ b/dictionaries/en/en_GB.aff @@ -13,7 +13,7 @@ # - recognizing words with Unicode f ligatures # - add phonetic suggestion (Copyright (C) 2000 Björn Jacke, see the end of the file) FLAG num -AF 712 +AF 713 AF 1 # 1 AF 2,3 # 2 AF 4,2 # 3 @@ -726,6 +726,7 @@ AF 201,202 # 710 AF 205 # 711 AF 203,300 # 712 +AF 17,200 # 713 AM 2042 AM ts:0 AM st:abatis ts:Ns diff --git a/dictionaries/en/en_GB.dic b/dictionaries/en/en_GB.dic index 7e50035..a482557 100644 --- a/dictionaries/en/en_GB.dic +++ b/dictionaries/en/en_GB.dic @@ -1,4 +1,4 @@ -56506 +56507 à 3GPP/1 AAA @@ -51200,6 +51200,7 @@ tranquillizations tranquillize/6 1 tranquillizer/21 +trans 1 transact/101 transaction/2 1 transactional/81 @@ -51331,7 +51332,7 @@ transvestite/2 1 transvestitism 1 Transylvania/1 -tranny/53 1 +tranny/713 1 trap/110 1 trapdoor/9 1 trapeze/16 1 diff --git a/dictionaries/en/en_ZA.aff b/dictionaries/en/en_ZA.aff index 484d733..41d75b1 100644 --- a/dictionaries/en/en_ZA.aff +++ b/dictionaries/en/en_ZA.aff @@ -12,6 +12,7 @@ # - add phonetic suggestion (Copyright (C) 2000 Björn Jacke, see the end of the file) SET UTF-8 TRY esiaénrtolcdugmfphbyvkw-'.zqjxSNRTLCGDMFPHBEAUYOIVKWóöâôZQJXÅçèîêàïüäñ +NOSUGGEST ! REP 36 REP f ph REP ph f diff --git a/dictionaries/en/en_ZA.dic b/dictionaries/en/en_ZA.dic index af95275..49fc246 100644 --- a/dictionaries/en/en_ZA.dic +++ b/dictionaries/en/en_ZA.dic @@ -1,4 +1,4 @@ -53476 +53477 !boerbul !likable !poes @@ -4215,7 +4215,7 @@ cock-of-the-wood cockiness/S cockscomb/MS -cocksucker/S +cocksucker/S! cocksure cocky/TP coco/MS @@ -5764,7 +5764,7 @@ frustrater/M frustum/MS ftp -fuck/RGJMDS +fuck/RGJMDS! fudge/DGMS fulfiller full/RPYTG @@ -25771,7 +25771,7 @@ cumin/MS cumulonimbi cunnilingus/MS -cunt/MS +cunt/MS! cupful/MS cupidity/SM cupping/M @@ -42019,9 +42019,10 @@ traitor/MS trammel/DSG tramway/SM -tranny/S +tranny/S! tranquillity/S tranquilly/q89Qs- +trans transceiver/SM transcendentalism/SM transcriptional @@ -46327,7 +46328,7 @@ bullied/M bullion/SM bullpen/SM -bullshit/RGSDM +bullshit/RGSDM! bullying/M bum/TDGRMS bumble/RSkDG @@ -50280,7 +50281,7 @@ niece/MS nifty/TYS niggard/MSY -nigger/MS +nigger/MS! night's night-blindness night-life/M -- To view, visit https://gerrit.libreoffice.org/2488 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3f3f21402eb0d74b486c60939a8eba21e935be46 Gerrit-PatchSet: 1 Gerrit-Project: dictionaries Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Andras Timar ati...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0] fdo#61660 unhelpful dictionary entries
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/2489 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/dictionaries refs/changes/89/2489/1 fdo#61660 unhelpful dictionary entries * do not suggest the word 'tranny' ever * add NOSUGGEST support to en_ZA dictionary * accept the word trans as in trans-woman, trans-man, etc. Change-Id: I3f3f21402eb0d74b486c60939a8eba21e935be46 --- M en/en_AU.dic M en/en_GB.aff M en/en_GB.dic M en/en_ZA.aff M en/en_ZA.dic 5 files changed, 18 insertions(+), 13 deletions(-) diff --git a/en/en_AU.dic b/en/en_AU.dic index f91fcec..7eeb40a 100644 --- a/en/en_AU.dic +++ b/en/en_AU.dic @@ -1,4 +1,4 @@ -49844 +49845 1st 2 2nd @@ -38914,9 +38914,10 @@ trampler's tramway/SM Tranmere -tranny/S +tranny/S! tranquillity/S tranquilly/qQs +trans transceiver/SM transcendentalism/SM transcriptional @@ -40890,7 +40891,7 @@ bullied/M bullion/SM bullpen/SM -bullshit/RGSDM +bullshit/RGSDM! bullying/M bum/TDGRSM bumble/RMSkDG diff --git a/en/en_GB.aff b/en/en_GB.aff index cca9a79..4fff89e 100644 --- a/en/en_GB.aff +++ b/en/en_GB.aff @@ -13,7 +13,7 @@ # - recognizing words with Unicode f ligatures # - add phonetic suggestion (Copyright (C) 2000 Björn Jacke, see the end of the file) FLAG num -AF 712 +AF 713 AF 1 # 1 AF 2,3 # 2 AF 4,2 # 3 @@ -726,6 +726,7 @@ AF 201,202 # 710 AF 205 # 711 AF 203,300 # 712 +AF 17,200 # 713 AM 2042 AM ts:0 AM st:abatis ts:Ns diff --git a/en/en_GB.dic b/en/en_GB.dic index 7e50035..a482557 100644 --- a/en/en_GB.dic +++ b/en/en_GB.dic @@ -1,4 +1,4 @@ -56506 +56507 à 3GPP/1 AAA @@ -51200,6 +51200,7 @@ tranquillizations tranquillize/6 1 tranquillizer/21 +trans 1 transact/101 transaction/2 1 transactional/81 @@ -51331,7 +51332,7 @@ transvestite/2 1 transvestitism 1 Transylvania/1 -tranny/53 1 +tranny/713 1 trap/110 1 trapdoor/9 1 trapeze/16 1 diff --git a/en/en_ZA.aff b/en/en_ZA.aff index 484d733..41d75b1 100644 --- a/en/en_ZA.aff +++ b/en/en_ZA.aff @@ -12,6 +12,7 @@ # - add phonetic suggestion (Copyright (C) 2000 Björn Jacke, see the end of the file) SET UTF-8 TRY esiaénrtolcdugmfphbyvkw-'.zqjxSNRTLCGDMFPHBEAUYOIVKWóöâôZQJXÅçèîêàïüäñ +NOSUGGEST ! REP 36 REP f ph REP ph f diff --git a/en/en_ZA.dic b/en/en_ZA.dic index af95275..49fc246 100644 --- a/en/en_ZA.dic +++ b/en/en_ZA.dic @@ -1,4 +1,4 @@ -53476 +53477 !boerbul !likable !poes @@ -4215,7 +4215,7 @@ cock-of-the-wood cockiness/S cockscomb/MS -cocksucker/S +cocksucker/S! cocksure cocky/TP coco/MS @@ -5764,7 +5764,7 @@ frustrater/M frustum/MS ftp -fuck/RGJMDS +fuck/RGJMDS! fudge/DGMS fulfiller full/RPYTG @@ -25771,7 +25771,7 @@ cumin/MS cumulonimbi cunnilingus/MS -cunt/MS +cunt/MS! cupful/MS cupidity/SM cupping/M @@ -42019,9 +42019,10 @@ traitor/MS trammel/DSG tramway/SM -tranny/S +tranny/S! tranquillity/S tranquilly/q89Qs- +trans transceiver/SM transcendentalism/SM transcriptional @@ -46327,7 +46328,7 @@ bullied/M bullion/SM bullpen/SM -bullshit/RGSDM +bullshit/RGSDM! bullying/M bum/TDGRMS bumble/RSkDG @@ -50280,7 +50281,7 @@ niece/MS nifty/TYS niggard/MSY -nigger/MS +nigger/MS! night's night-blindness night-life/M -- To view, visit https://gerrit.libreoffice.org/2489 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3f3f21402eb0d74b486c60939a8eba21e935be46 Gerrit-PatchSet: 1 Gerrit-Project: dictionaries Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Andras Timar ati...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] RTL_CONSTASCII_USTRINGPARAM and ::rtl:: removals
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2486 Approvals: Andras Timar: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2486 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3ef372b07f2bacc2b9034e3d61b9cc8a3677 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Krisztian Pinter pin.termina...@gmail.com Gerrit-Reviewer: Andras Timar ati...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0] bin PATCH_SO_NAME crack
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/2463 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/63/2463/1 bin PATCH_SO_NAME crack In VersionInfo of Windows executables the FileDescription property originally contained 80 times 'x' character. These executables were marked as PATCH_SO_NAME and later the installer maker perl program replaced the xxx to the actual file description which was defined in scp2. WHy was it good, I have no idea. The problem was that it happened after postprocess, where we signed the binaries, thus diigital signature became corrupted. It is better to give file descriptions via makefiles. Conflicts: crashrep/WinResTarget_crashrep.mk Oh, well, crashrep is a dmake module in 4.0. But it is not built, so patch has no effect in practice. Change-Id: Id5ad4470bb7a6313b33fbba09d72d9a009163a89 --- M crashrep/source/win32/rcheader.txt M desktop/WinResTarget_sbase.mk M desktop/WinResTarget_scalc.mk M desktop/WinResTarget_sdraw.mk M desktop/WinResTarget_simpress.mk M desktop/WinResTarget_smath.mk M desktop/WinResTarget_soffice.mk M desktop/WinResTarget_sofficebin.mk M desktop/WinResTarget_sweb.mk M desktop/WinResTarget_swriter.mk M desktop/util/officeloader.rc M desktop/win32/source/applauncher/launcher.rc M scp2/source/base/file_base.scp M scp2/source/calc/file_calc.scp M scp2/source/crashrep/file_crashrep.scp M scp2/source/draw/file_draw.scp M scp2/source/impress/file_impress.scp M scp2/source/math/file_math.scp M scp2/source/ooo/common_brand.scp M scp2/source/writer/file_writer.scp 20 files changed, 20 insertions(+), 54 deletions(-) diff --git a/crashrep/source/win32/rcheader.txt b/crashrep/source/win32/rcheader.txt index be3c060..bace84b 100644 --- a/crashrep/source/win32/rcheader.txt +++ b/crashrep/source/win32/rcheader.txt @@ -58,13 +58,14 @@ block 040904E4 { // International StringTable - value CompanyName,The Document Foundation\0 - value FileDescription, \0 - value FileVersion,PPS(VER_LEVEL) \0 - value ProductVersion, PPS(VER_LEVEL) \0 - value OriginalFilename, SOREPORT.EXE\0 - value InternalName, CrashReport\0 - value LegalCopyright, S_CRIGHT LibreOffice contributors and/or their affiliates. All rights reserved.\0 +VALUE CompanyName, PPS(RES_APP_VENDOR) \0 +VALUE FileDescription, PPS(RES_APP_FILEDESC) \0 +VALUE FileVersion, PPS(VER_LEVEL) \0 +VALUE ProductVersion, PPS(VER_LEVEL) \0 +VALUE ProductName, LibreOffice\0 +VALUE OriginalFilename, PPS(RES_APP_NAME) .exe\0 +VALUE InternalName, PPS(RES_APP_NAME) \0 +VALUE LegalCopyright, S_CRIGHT LibreOffice contributors and/or their affiliates. All rights reserved.\0 } } diff --git a/desktop/WinResTarget_sbase.mk b/desktop/WinResTarget_sbase.mk index 008e436..f4f49d4 100644 --- a/desktop/WinResTarget_sbase.mk +++ b/desktop/WinResTarget_sbase.mk @@ -34,6 +34,7 @@ $(eval $(call gb_WinResTarget_add_defs,sbase/src,\ -DRES_APP_NAME=sbase \ +-DRES_APP_FILEDESC=$(PRODUCTNAME) Base \ -DRES_APP_ICON=icons/base_app.ico \ -DVERVARIANT=$(BUILD) \ -DRES_APP_VENDOR=$(OOO_VENDOR) \ diff --git a/desktop/WinResTarget_scalc.mk b/desktop/WinResTarget_scalc.mk index 89a2d2d..8781d0d 100644 --- a/desktop/WinResTarget_scalc.mk +++ b/desktop/WinResTarget_scalc.mk @@ -34,6 +34,7 @@ $(eval $(call gb_WinResTarget_add_defs,scalc/src,\ -DRES_APP_NAME=scalc \ +-DRES_APP_FILEDESC=$(PRODUCTNAME) Calc \ -DRES_APP_ICON=icons/calc_app.ico \ -DVERVARIANT=$(BUILD) \ -DRES_APP_VENDOR=$(OOO_VENDOR) \ diff --git a/desktop/WinResTarget_sdraw.mk b/desktop/WinResTarget_sdraw.mk index 44ef306..09a8bf2 100644 --- a/desktop/WinResTarget_sdraw.mk +++ b/desktop/WinResTarget_sdraw.mk @@ -34,6 +34,7 @@ $(eval $(call gb_WinResTarget_add_defs,sdraw/src,\ -DRES_APP_NAME=sdraw \ +-DRES_APP_FILEDESC=$(PRODUCTNAME) Draw \ -DRES_APP_ICON=icons/draw_app.ico \ -DVERVARIANT=$(BUILD) \ -DRES_APP_VENDOR=$(OOO_VENDOR) \ diff --git a/desktop/WinResTarget_simpress.mk b/desktop/WinResTarget_simpress.mk index 224af5b..eeb869f 100644 --- a/desktop/WinResTarget_simpress.mk +++ b/desktop/WinResTarget_simpress.mk @@ -34,6 +34,7 @@ $(eval $(call gb_WinResTarget_add_defs,simpress/src,\ -DRES_APP_NAME=simpress \ +-DRES_APP_FILEDESC=$(PRODUCTNAME) Impress \
[PATCH libreoffice-4-0] fdo#61453 fix truncation on German UI
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/2469 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/69/2469/1 fdo#61453 fix truncation on German UI Change-Id: I4ec173dc2856a6208f1149a5a9cbfc18873d1f2e --- M sfx2/source/dialog/mgetempl.src 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sfx2/source/dialog/mgetempl.src b/sfx2/source/dialog/mgetempl.src index 218883d..ac03fb0 100644 --- a/sfx2/source/dialog/mgetempl.src +++ b/sfx2/source/dialog/mgetempl.src @@ -43,7 +43,7 @@ MultiLineEdit MLE_NAME { Pos = MAP_APPFONT ( 70 , 8 ) ; -Size = MAP_APPFONT ( 80 , 12 ) ; +Size = MAP_APPFONT ( 184 , 12 ) ; Border = FALSE; ReadOnly = TRUE; Hide = TRUE; -- To view, visit https://gerrit.libreoffice.org/2469 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4ec173dc2856a6208f1149a5a9cbfc18873d1f2e Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Andras Timar ati...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0] fdo#57536 remove 着:著, because it is wrong is some cases
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/2459 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/59/2459/1 fdo#57536 remove 着:著, because it is wrong is some cases Change-Id: Ia7c5692e1da4d24d985f0813e07631898d7100ce --- M i18npool/source/textconversion/data/stc_char.dic 1 file changed, 0 insertions(+), 1 deletion(-) diff --git a/i18npool/source/textconversion/data/stc_char.dic b/i18npool/source/textconversion/data/stc_char.dic index 92a06f2..5f06fa7 100644 --- a/i18npool/source/textconversion/data/stc_char.dic +++ b/i18npool/source/textconversion/data/stc_char.dic @@ -1179,7 +1179,6 @@ 眯:瞇眯 眺:眺覜 眬:矓 -着:著 睁:睜 睐:睞 睑:瞼 -- To view, visit https://gerrit.libreoffice.org/2459 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia7c5692e1da4d24d985f0813e07631898d7100ce Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Andras Timar ati...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Database: Add Limit in Query Desing View
Hello LibreOffice gerrit bot, Zolnai Tamás, Eike Rathke, I'd like you to reexamine a change. Please visit https://gerrit.libreoffice.org/1994 to look at the new patch set (#5). Change subject: Database: Add Limit in Query Desing View .. Database: Add Limit in Query Desing View Levels of implementation - Add a new toolbar item to ui (designobjectbar.xml) - Make a control for this element( LimitBox: derived from NumericBox) - Make an own controller for this control (LimitBoxController) and register it - Add new feature to the general\central controller (OQueryController) and construct a communication channel between the two controller - Modify the view switching (SQL-Design) methods to use\set limit value (QueryDesignView.cxx) Conflicts: dbaccess/source/ui/querydesign/QueryDesignView.cxx Change-Id: I0eb09d1d40cfdb9b8a2a57ab8911faca91d5e690 --- M dbaccess/Library_dbu.mk M dbaccess/inc/dbaccess_slotid.hrc M dbaccess/source/ui/inc/dbu_qry.hrc M dbaccess/source/ui/inc/querycontroller.hxx M dbaccess/source/ui/misc/uiservices.cxx M dbaccess/source/ui/querydesign/QueryDesignView.cxx A dbaccess/source/ui/querydesign/limitboxcontroller.cxx A dbaccess/source/ui/querydesign/limitboxcontroller.hxx M dbaccess/source/ui/querydesign/query.src M dbaccess/source/ui/querydesign/querycontroller.cxx M dbaccess/uiconfig/dbquery/toolbar/designobjectbar.xml M dbaccess/util/dbu.component M officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu M officecfg/registry/data/org/openoffice/Office/UI/DbuCommands.xcu 14 files changed, 488 insertions(+), 4 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/94/1994/5 -- To view, visit https://gerrit.libreoffice.org/1994 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I0eb09d1d40cfdb9b8a2a57ab8911faca91d5e690 Gerrit-PatchSet: 5 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Zolnai Tamás zolnaitamas2...@gmail.com Gerrit-Reviewer: Andras Timar ati...@suse.com Gerrit-Reviewer: Eike Rathke er...@redhat.com Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org Gerrit-Reviewer: Lionel Elie Mamane lio...@mamane.lu Gerrit-Reviewer: Norbert Thiebaud nthieb...@gmail.com Gerrit-Reviewer: Zolnai Tamás zolnaitamas2...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] [PUSHED] Database: Add Limit in Query Desing View
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1994 Approvals: Andras Timar: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1994 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0eb09d1d40cfdb9b8a2a57ab8911faca91d5e690 Gerrit-PatchSet: 6 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Zolnai Tamás zolnaitamas2...@gmail.com Gerrit-Reviewer: Andras Timar ati...@suse.com Gerrit-Reviewer: Eike Rathke er...@redhat.com Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org Gerrit-Reviewer: Lionel Elie Mamane lio...@mamane.lu Gerrit-Reviewer: Norbert Thiebaud nthieb...@gmail.com Gerrit-Reviewer: Zolnai Tamás zolnaitamas2...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] [PUSHED] remove cross_toolset
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2193 Approvals: LibreOffice gerrit bot: Verified Andras Timar: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2193 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib707b3d17a2e091c150dc116f01c8d151d9461eb Gerrit-PatchSet: 11 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Peter Foley pefol...@verizon.net Gerrit-Reviewer: Andras Timar ati...@suse.com Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org Gerrit-Reviewer: Peter Foley pefol...@verizon.net ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED libreoffice-4-0] Proper escaping of quotes for android xml resource files.
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2173 Approvals: Andras Timar: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2173 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9f76986465af5798f1451d44af6765f4e5d1bb09 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Thorsten Behrens tbehr...@suse.com Gerrit-Reviewer: Andras Timar ati...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED libreoffice-4-0] Only escape double-quotes for ulf files.
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2172 Approvals: Andras Timar: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2172 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I96773d6e2a9af473e8c8309421b4900c0b76667f Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Thorsten Behrens tbehr...@suse.com Gerrit-Reviewer: Andras Timar ati...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED libreoffice-4-0] fdo#58283 produce all translations for desktop files
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2161 Approvals: Andras Timar: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2161 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie97e1ae7b2cc059630cba682a051eefff3ca044b Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: David Tardon dtar...@redhat.com Gerrit-Reviewer: Andras Timar ati...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice