[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - officecfg/registry
officecfg/registry/data/org/openoffice/Office/Accelerators.xcu |8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) New commits: commit 036bf5c78a3ead56f48b4be4d0462e23242c80e0 Author: Yousuf Philips <philip...@hotmail.com> Date: Sun Jan 28 19:52:42 2018 +0400 tdf#114858 Use Ctrl+` for Formula Toggle on Mac Change-Id: I0685eb0d1f6ea7c8502bbaa22f0e90004947282d Reviewed-on: https://gerrit.libreoffice.org/48793 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Yousuf Philips <philip...@hotmail.com> (cherry picked from commit 532576461654eaf43120d2f693172c07a41275fa) Reviewed-on: https://gerrit.libreoffice.org/50971 Reviewed-by: Michael Meeks <michael.me...@collabora.com> diff --git a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu index b3f195413c17..6e9182150a56 100644 --- a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu +++ b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu @@ -1080,7 +1080,13 @@ I10N SHORTCUTS - NO TRANSLATE -.uno:ToggleFormula +.uno:ToggleFormula + + + + +I10N SHORTCUTS - NO TRANSLATE +.uno:ToggleFormula ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - dictionaries
dictionaries |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 253faaa8fc3eb240d5c36158f9cdc932f2bb1dc1 Author: Yousuf Philips <philip...@hotmail.com> Date: Thu Feb 1 23:11:54 2018 +0400 Updated core Project: dictionaries eaeb462d78121c7b9ba7c9e6c6de94c5781c9fbd Update arabic dictionary to version 3.5 (2014-11-08) Files extracted from http://sourceforge.net/projects/ayaspell/files/dict_ar-3.5.2014-11-08.oxt/download Change-Id: Ic3ffb861a253f680e96e437b5dc2f3da4e392a21 Reviewed-on: https://gerrit.libreoffice.org/49028 Reviewed-by: Andras Timar <andras.ti...@collabora.com> Tested-by: Andras Timar <andras.ti...@collabora.com> (cherry picked from commit 476ebd97bbfdcf59f00cd832647b880ddfdfb252) Reviewed-on: https://gerrit.libreoffice.org/50675 diff --git a/dictionaries b/dictionaries index 79b662808e98..eaeb462d7812 16 --- a/dictionaries +++ b/dictionaries @@ -1 +1 @@ -Subproject commit 79b662808e98cda02dc4326f32cfce28fcbba7b8 +Subproject commit eaeb462d78121c7b9ba7c9e6c6de94c5781c9fbd ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: officecfg/registry
officecfg/registry/data/org/openoffice/VCL.xcu | 40 - 1 file changed, 20 insertions(+), 20 deletions(-) New commits: commit 16700331da2087bbb53c1774605cef2d0411206a Author: Yousuf Philips <philip...@hotmail.com> Date: Wed Feb 21 17:51:19 2018 +0400 tdf#114768: Update default font list for Simplified Chinese Change-Id: I23e92f1248d8f0bc424278e565bd5bfdbe30f7c5 Reviewed-on: https://gerrit.libreoffice.org/49520 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Yousuf Philips <philip...@hotmail.com> diff --git a/officecfg/registry/data/org/openoffice/VCL.xcu b/officecfg/registry/data/org/openoffice/VCL.xcu index 0e6777f47a93..91526d120ee2 100644 --- a/officecfg/registry/data/org/openoffice/VCL.xcu +++ b/officecfg/registry/data/org/openoffice/VCL.xcu @@ -245,32 +245,32 @@ - -微软雅黑;方正宋体;ZYSong18030;AR PL SungtiL GB;MSung Light SC;SimSun;Song;FZSongYi;FZShuSong;NSimSun;Arial Unicode MS;Lucida Sans Unicode;Tahoma - -方正宋体;ZYSong18030;AR PL SungtiL GB;新宋体;NSimSun;文鼎PL细上海宋Uni;AR PL ShanHeiSun Uni;文鼎ＰＬ新宋;AR PL New Sung;MSung Light SC;Cumberland AMT;Cumberland;Courier New;Nimbus Mono L;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced +思源黑体;Source Han Sans;思源黑体 CN;Source Han Sans CN;Noto Sans Mono CJK SC;新宋体;NSimSun;Liberation Mono;Menlo;Courier New;Monospaced + + +思源黑体;Source Han Sans;思源黑体 CN;Source Han Sans CN;Noto Sans CJK SC;微软雅黑;Microsoft Yahei;新宋体;NSimSun;萍方-简;PingFang SC;华文细黑;STXihei;Arial Unicode MS;Liberation Sans;Tahoma -微软雅黑;方正黑体;方正宋体;ZYSong18030;AR PL SungtiL GB;宋体;SimSun;黑体;文鼎PL中楷Uni;AR PL ZenKai Uni;文鼎PL细上海宋Uni;AR PL ShanHeiSun Uni;文鼎ＰＬ新宋;AR PL New Sung;MSung Light SC;Song;FZSongYi;FZShuSong;NSimSun;Arial Unicode MS;Lucida Sans Unicode;Tahoma +思源黑体;Source Han Sans;思源黑体 CN;Source Han Sans CN;Noto Sans CJK SC;微软雅黑;Microsoft Yahei;新宋体;NSimSun;萍方-简;PingFang SC;华文细黑;STXihei;Arial Unicode MS;Liberation Sans;Tahoma -微软雅黑;方正宋体;ZYSong18030;AR PL SungtiL GB;宋体;SimSun;文鼎PL细上海宋Uni;AR PL ShanHeiSun Uni;文鼎ＰＬ新宋;AR PL New Sung;MSung Light SC;Song;FZSongYi;FZShuSong;NSimSun;Arial Unicode MS;Lucida Sans Unicode;Tahoma +思源黑体;Source Han Sans;思源黑体 CN;Source Han Sans CN;Noto Sans CJK SC;微软雅黑;Microsoft Yahei;新宋体;NSimSun;萍方-简;PingFang SC;华文细黑;STXihei;Arial Unicode MS;Liberation Sans;Tahoma -微软雅黑;方正宋体;ZYSong18030;AR PL SungtiL GB;宋体;SimSun;文鼎PL细上海宋Uni;AR PL ShanHeiSun Uni;文鼎ＰＬ新宋;AR PL New Sung;MSung Light SC;Song;FZSongYi;FZShuSong;NSimSun;Arial Unicode MS;Lucida Sans Unicode;Tahoma +思源黑体;Source Han Sans;思源黑体 CN;Source Han Sans CN;Noto Sans CJK SC;微软雅黑;Microsoft Yahei;新宋体;NSimSun;萍方-简;PingFang SC;华文细黑;STXihei;Arial Unicode MS;Liberation Sans;Tahoma -方正宋体;ZYSong18030;AR PL SungtiL GB;SimSun;文鼎PL细上海宋Uni;AR PL ShanHeiSun Uni;文鼎ＰＬ新宋;AR PL New Sung;MSung Light SC;Song;FZSongYi;FZShuSong;NSimSun;Arial Unicode MS;Lucida Sans Unicode;Tahoma +思源宋体;Source Han Serif;思源宋体 CN;Source Han Serif CN;Noto Serif CJK SC;新宋体;NSimSun;宋体;SimSun;华文宋体;Songti SC;STSong;Arial Unicode MS;Liberation Sans;Tahoma -方正宋体;ZYSong18030;AR PL SungtiL GB;新宋体;NSimSun;文鼎PL细上海宋Uni;AR PL ShanHeiSun Uni;文鼎ＰＬ新宋;AR PL New Sung;MSung Light SC;Cumberland AMT;Cumberland;Courier New;Nimbus Mono L;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced +思源黑体;Source Han Sans;思源黑体 CN;Source Han Sans CN;Noto Sans Mono CJK SC;新宋体;NSimSun;Liberation Mono;Menlo;Courier New;Monospaced -方正宋体;ZYSong18030;AR PL SungtiL GB;新宋体;NSimSun;文鼎PL细上海宋Uni;AR PL ShanHeiSun Uni;文鼎ＰＬ新宋;AR PL New Sung;MSung Light SC;Cumberland AMT;Cumberland;Courier New;Nimbus Mono L;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced +思源黑体;Source Han Sans;思源黑体 CN;Source Han Sans CN;Noto Sans Mono CJK SC;新宋体;NSimSun;Liberation Mono;Menlo;Courier New;Monospaced -方正宋体;ZYSong18030;AR PL SungtiL GB;SimSun;文鼎PL细上海宋Uni;AR PL ShanHeiSun Uni;文鼎ＰＬ新宋;AR PL New Sung;ZYSong18030;AR PL SungtiL GB;AR PL KaitiM GB;SimSun;Arial Unicode MS;Fangsong;Hei;Song;Kai;Ming;gnu-unifont;Interface User;Geneva;Tahoma;Dialog;Albany AMT;Albany;Lucida;Arial;Nimbus Sans L;Helvetica;Helmet;Interface System;Sans Serif +思源黑体;Source Han Sans;思源黑体 CN;Source Han Sans CN;Noto Sans CJK SC;微软雅黑;Microsoft Yahei;新宋体;NSimSun;宋体;SimSun;萍方-简;PingFang SC;华文细黑;STXihei;Segoe UI;Tahoma;San Francisco;Lucida Grande;Sans Serif @@ -362,31 +362,31 @@ -方正宋体;ZYSong18030;AR PL SungtiL GB;新宋体;NSimSun;文鼎PL细上海宋Uni;AR PL ShanHeiSun Uni;文鼎ＰＬ新宋;AR PL New Sung;MSung Light TC;Cumberland AMT;Cumberland;Courier New;Nimbus Mono L;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced +思源黑体;Source Han Sans;思源黑体 CN;Source Han Sans CN;Noto Sans Mono
[Libreoffice-commits] core.git: officecfg/registry
officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu| 28 +- officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu | 11 +++ officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu | 11 --- 3 files changed, 27 insertions(+), 23 deletions(-) New commits: commit 4902aeff480692a0f3ddfc7e1182038868712f52 Author: Yousuf Philips <philip...@hotmail.com> Date: Thu Feb 22 17:20:35 2018 +0400 tdf#113651 Sync Calc Track Changes commands with Writers For a consistent UX Change-Id: I1ad937124786d2e7d0a752f819144172ae902ed5 Reviewed-on: https://gerrit.libreoffice.org/45267 Reviewed-by: Heiko Tietze <tietze.he...@gmail.com> Tested-by: Heiko Tietze <tietze.he...@gmail.com> Tested-by: Jenkins <c...@libreoffice.org> diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu index 453969395614..979e90349570 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu @@ -179,14 +179,6 @@ 1 - - - ~Protect Records... - - - 1 - - Link to E~xternal Data... @@ -944,7 +936,10 @@ - ~Record Changes + ~Record + + + Record Track Changes 1 @@ -952,7 +947,10 @@ - ~Show Changes... + ~Show... + + + Show Track Changes 1 @@ -1080,7 +1078,10 @@ - ~Manage Changes... + ~Manage... + + + Manage Track Changes 1 @@ -1088,7 +1089,10 @@ - ~Comment on Change... + ~Comment... + + + Insert Track Change Comment 1 diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu index b6bb6b9108eb..7a00557d5155 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu @@ -4466,6 +4466,17 @@ AutoPilot: Memo + + + ~Protect... + + + Protect Track Changes + + + 1 + + Compare diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu index d1f08c272834..c2b5999576a3 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu @@ -203,17 +203,6 @@ 1 - - - ~Protect... - - - Protect Track Changes - - - 1 - - Reject ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: officecfg/registry
officecfg/registry/data/org/openoffice/Office/UI/StartModuleCommands.xcu |
186 --
1 file changed, 186 deletions(-)
New commits:
commit a1eff3100a41f592407916dd4a21d0404f1364e1
Author: Yousuf Philips <philip...@hotmail.com>
Date: Fri Nov 17 18:52:30 2017 +0400
tdf#114206 remove duplication of strings in startmodulecommands.xcu
Change-Id: I4d034c029eec58d9e7c2dd500efc0b65a3c3dcb8
Reviewed-on: https://gerrit.libreoffice.org/44885
Reviewed-by: Yousuf Philips <philip...@hotmail.com>
Tested-by: Yousuf Philips <philip...@hotmail.com>
diff --git
a/officecfg/registry/data/org/openoffice/Office/UI/StartModuleCommands.xcu
b/officecfg/registry/data/org/openoffice/Office/UI/StartModuleCommands.xcu
index b1d34120d349..379aa6f151fa 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/StartModuleCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/StartModuleCommands.xcu
@@ -20,192 +20,6 @@
http://openoffice.org/2001/registry;
xmlns:xs="http://www.w3.org/2001/XMLSchema;
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
xmlns:install="http://openoffice.org/2004/installation;
oor:name="StartModuleCommands" oor:package="org.openoffice.Office.UI">
-
-
- ~New
-
-
- 1
-
-
-
-
- ~Close
-
-
- 1
-
-
-
-
- Close Window
-
-
- 1
-
-
-
-
- ~Copy
-
-
- 1
-
-
-
-
- ~Cut
-
-
- 1
-
-
-
-
- What's ~This?
-
-
-
-
- %PRODUCTNAME ~Help
-
-
- 1
-
-
-
-
- New Document From Template
-
-
- 1
-
-
-
-
- ~Open...
-
-
- 1
-
-
-
-
- Load URL
-
-
- 1
-
-
-
-
- ~Paste
-
-
- 1
-
-
-
-
- ~Print...
-
-
- 1
-
-
-
-
- P~rinter Settings...
-
-
- 1
-
-
-
-
- E~xit
-
-
- 1
-
-
-
-
- ~Save
-
-
- 1
-
-
-
-
- Save ~As...
-
-
- 1
-
-
-
-
- Document as ~E-mail...
-
-
- 1
-
-
-
-
- Propert~ies...
-
-
- 1
-
-
-
-
- Undo
-
-
- 1
-
-
-
-
-
-
- ~Edit
-
-
-
-
- ~Help
-
-
-
-
- ~Macros
-
-
-
-
- ~File
-
-
-
-
- ~Tools
-
-
-
-
- ~View
-
-
-
-
- ~Window
-
-
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: readlicense_oo/license
readlicense_oo/license/LICENSE | 24 readlicense_oo/license/LICENSE.fodt | 10 +- 2 files changed, 1 insertion(+), 33 deletions(-) New commits: commit bca6b706dfa092ed5d2c9ad58c18c9e598d6e2f1 Author: Yousuf Philips <philip...@hotmail.com> Date: Wed Jan 31 02:47:14 2018 +0400 tdf#103080 Remove Open Sans and PT_Serif licenses Change-Id: I024669ca552c00fd0b62c4eb25bccb88666295de Reviewed-on: https://gerrit.libreoffice.org/48941 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Yousuf Philips <philip...@hotmail.com> diff --git a/readlicense_oo/license/LICENSE b/readlicense_oo/license/LICENSE index 7ebab994a6f8..3ce5873c9aeb 100644 --- a/readlicense_oo/license/LICENSE +++ b/readlicense_oo/license/LICENSE @@ -3111,30 +3111,6 @@ Linux Libertine G and Linux Biolinum G OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE. -Open Sans - - The following software may be included in this product: Open Sans - fonts. Use of any of this software is governed by the terms of the - license below: - - See Apache License Version 2.0 below - -PT Serif - - The following software may be included in this product: PT Serif fonts. - Use of any of this software is governed by the terms of the license - below: - - Copyright (c) 2010, ParaType Ltd. - (http://www.paratype.com/public), with Reserved Font Names "PT - Sans", "PT Serif" and "ParaType". - - This Font Software is licensed under the SIL Open Font License, Version - 1.1. This license is copied below, and is also available with a - FAQ at: http://scripts.sil.org/OFL - - See SIL Open Font License, Version 1.1 below - Source Code Pro The following software may be included in this product: Source Code Pro diff --git a/readlicense_oo/license/LICENSE.fodt b/readlicense_oo/license/LICENSE.fodt index bf25468c4f97..de7ff7ef9052 100644 --- a/readlicense_oo/license/LICENSE.fodt +++ b/readlicense_oo/license/LICENSE.fodt @@ -4221,14 +4221,6 @@ 5) The Font Software, modified or unmodified, in part or in whole, must be distributed using this license, and may not be distributed under any other license. TERMINATION This license becomes null and void if any of the above conditions are not met. DISCLAIMER THE FONT SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE. - Open Sans - The following software may be included in this product: Open Sans fonts. Use of any of this software is governed by the terms of the license below: - Jump to Apache License Version 2.0 - PT Serif - The following software may be included in this product: PT Serif fonts. Use of any of this software is governed by the terms of the license below: - Copyright (c) 2010, ParaType Ltd. (http://www.paratype.com/public; text:style-name="Internet_20_link" text:visited-style-name="Visited_20_Internet_20_Link">http://www.paratype.com/public), with Reserved Font Names PT Sans, PT Serif and ParaType. - This Font Software is licensed under the SIL Open Font License, Version 1.1. This license is copied below, and is also available with a FAQ at: http://scripts.sil.org/OFL; text:style-name="Internet_20_link" text:visited-style-name="Visited_20_Internet_20_Link">http://scripts.sil.org/OFL - Jump to SIL Open Font License, Version 1.1 Source Code Pro The following software may be included in this product: Source Code Pro fonts. Use of any of this software is governed by the terms of the license below: Copyright 2010, 2012 Adobe Systems Incorporated (http://www.adobe.com/; text:style-name="Internet_20_link" text:visited-style-name="Visited_20_Internet_20_Link">http://www.adobe.com/), with Reserved Font Name Source. All Rights Reserved. Source is a trademark of Adobe Systems Incorporated in the United States and/or other countries. @@ -6701,4 +6693,4 @@ Creative Commons may be contacted at http://creativecommons.org/; text:style-name="Internet_20_link" text:visited-style-name="Visited_20_Internet_20_Link">http://creativecommons.org/. - \ No newline at end of file + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - sd/uiconfig
sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui |6 +++--- sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui|2 +- 2 files changed, 4 insertions(+), 4 deletions(-) New commits: commit 3b0866ca2ef2cfece6b1763dcfe4462adf5f77e2 Author: Yousuf Philips <philip...@hotmail.com> Date: Fri Feb 9 14:25:11 2018 +0400 tdf#114972 Make insert textbox work in Impress grouped notebookbars Change-Id: I35a7efeec01a6aeae5bc4bcb49151cba1d225d61 Reviewed-on: https://gerrit.libreoffice.org/49481 Reviewed-by: andreas_kainz <kain...@gmail.com> Tested-by: andreas_kainz <kain...@gmail.com> Reviewed-by: Yousuf Philips <philip...@hotmail.com> (cherry picked from commit 10a7dddf65b4fd9716bd8815debfa1cdd4ac184c) Reviewed-on: https://gerrit.libreoffice.org/49494 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Heiko Tietze <tietze.he...@gmail.com> diff --git a/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui b/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui index 2fdf2d2798cd..d8dcca06fa2c 100644 --- a/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui +++ b/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui @@ -3133,7 +3133,7 @@ True False -.uno:DrawText +.uno:Text False @@ -4462,7 +4462,7 @@ True False -.uno:DrawText +.uno:Text False @@ -6092,7 +6092,7 @@ True False -.uno:DrawText +.uno:Text False diff --git a/sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui b/sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui index a439ff3e118b..fd57056975d1 100644 --- a/sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui +++ b/sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui @@ -3932,7 +3932,7 @@ True False -.uno:DrawText +.uno:Text True ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - sw/uiconfig
sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d5dc4af8e53180aa1cd39ec54262e91ad2d0510b Author: Yousuf Philips <philip...@hotmail.com> Date: Fri Feb 9 14:34:51 2018 +0400 tdf#114299 Ensure groupedbar full works in print preview mode Change-Id: I154d22deeafc76e6afff9ccf5cbd5f8aa9ec3a57 Reviewed-on: https://gerrit.libreoffice.org/49480 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Yousuf Philips <philip...@hotmail.com> (cherry picked from commit bbc4f9fee81656c618329cee088d9eedd9a1c457) Reviewed-on: https://gerrit.libreoffice.org/49519 Reviewed-by: Heiko Tietze <tietze.he...@gmail.com> diff --git a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui index 61b2bba98653..e4f71a9bc84b 100644 --- a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui +++ b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui @@ -6105,7 +6105,7 @@ <class name="context-Text"/> - <class name="context-Default"/> + <class name="context-default"/> ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - sw/uiconfig
sw/uiconfig/swform/toolbar/moreformcontrols.xml |6 -- 1 file changed, 4 insertions(+), 2 deletions(-) New commits: commit 2460d20c9a10920944b470d5ff5871f2bdb328f5 Author: Yousuf Philips <philip...@hotmail.com> Date: Tue Feb 13 19:27:45 2018 +0400 tdf#115447 tdf#81475 Restore form controls used in forms Change-Id: I41b72aa6e453d15287573c3fb2d0536a132e490d Reviewed-on: https://gerrit.libreoffice.org/49671 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Yousuf Philips <philip...@hotmail.com> (cherry picked from commit 603d1773a2dfea6b347f44ddacef478577098caf) Reviewed-on: https://gerrit.libreoffice.org/49723 Reviewed-by: Heiko Tietze <tietze.he...@gmail.com> diff --git a/sw/uiconfig/swform/toolbar/moreformcontrols.xml b/sw/uiconfig/swform/toolbar/moreformcontrols.xml index bb170f6ed9bc..e0e1fbba4085 100644 --- a/sw/uiconfig/swform/toolbar/moreformcontrols.xml +++ b/sw/uiconfig/swform/toolbar/moreformcontrols.xml @@ -27,6 +27,8 @@ - - + + + + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - officecfg/registry
officecfg/registry/data/org/openoffice/VCL.xcu |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d501ff5f866994a86f8c8d34a5a08ee5b739fa7e Author: Yousuf Philips <philip...@hotmail.com> Date: Thu Feb 8 00:39:22 2018 +0400 tdf#113538 David CLM has higher priority to David Libre Mistake from my earlier patch a2158c6ca2ba831665019827889f01e98dc93394 Change-Id: Id535ca2243e368fde9482ae9853f7ae6dd10a449 Reviewed-on: https://gerrit.libreoffice.org/49392 Reviewed-by: Lior Kaplan <kaplanl...@gmail.com> Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Yousuf Philips <philip...@hotmail.com> (cherry picked from commit 9cf22b64183a341429aafac82c6562f869bc7383) Reviewed-on: https://gerrit.libreoffice.org/49779 Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com> diff --git a/officecfg/registry/data/org/openoffice/VCL.xcu b/officecfg/registry/data/org/openoffice/VCL.xcu index d759ef68509f..762f35d75c62 100644 --- a/officecfg/registry/data/org/openoffice/VCL.xcu +++ b/officecfg/registry/data/org/openoffice/VCL.xcu @@ -189,7 +189,7 @@ Nachlieli CLM;Alef;Noto Sans Hebrew;Liberation Sans;Arial;Arial Hebrew;Lucida Sans Unicode;Lucida Grande;Arial Unicode MS -David Libre;David CLM;Frank Ruehl CLM;Liberation Serif;David;Raanana;Lucida Sans Unicode;Lucida Grande;Arial Unicode MS +David CLM;David Libre;Frank Ruehl CLM;Liberation Serif;David;Raanana;Lucida Sans Unicode;Lucida Grande;Arial Unicode MS ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: officecfg/registry
officecfg/registry/data/org/openoffice/VCL.xcu |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 9cf22b64183a341429aafac82c6562f869bc7383 Author: Yousuf Philips <philip...@hotmail.com> Date: Thu Feb 8 00:39:22 2018 +0400 tdf#113538 David CLM has higher priority to David Libre Mistake from my earlier patch a2158c6ca2ba831665019827889f01e98dc93394 Change-Id: Id535ca2243e368fde9482ae9853f7ae6dd10a449 Reviewed-on: https://gerrit.libreoffice.org/49392 Reviewed-by: Lior Kaplan <kaplanl...@gmail.com> Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Yousuf Philips <philip...@hotmail.com> diff --git a/officecfg/registry/data/org/openoffice/VCL.xcu b/officecfg/registry/data/org/openoffice/VCL.xcu index ab30b58d755d..0e6777f47a93 100644 --- a/officecfg/registry/data/org/openoffice/VCL.xcu +++ b/officecfg/registry/data/org/openoffice/VCL.xcu @@ -189,7 +189,7 @@ Nachlieli CLM;Alef;Noto Sans Hebrew;Liberation Sans;Arial;Arial Hebrew;Lucida Sans Unicode;Lucida Grande;Arial Unicode MS -David Libre;David CLM;Frank Ruehl CLM;Liberation Serif;David;Raanana;Lucida Sans Unicode;Lucida Grande;Arial Unicode MS +David CLM;David Libre;Frank Ruehl CLM;Liberation Serif;David;Raanana;Lucida Sans Unicode;Lucida Grande;Arial Unicode MS ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/uiconfig
sw/uiconfig/swform/toolbar/moreformcontrols.xml |6 -- 1 file changed, 4 insertions(+), 2 deletions(-) New commits: commit 603d1773a2dfea6b347f44ddacef478577098caf Author: Yousuf Philips <philip...@hotmail.com> Date: Tue Feb 13 19:27:45 2018 +0400 tdf#115447 tdf#81475 Restore form controls used in forms Change-Id: I41b72aa6e453d15287573c3fb2d0536a132e490d Reviewed-on: https://gerrit.libreoffice.org/49671 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Yousuf Philips <philip...@hotmail.com> diff --git a/sw/uiconfig/swform/toolbar/moreformcontrols.xml b/sw/uiconfig/swform/toolbar/moreformcontrols.xml index bb170f6ed9bc..e0e1fbba4085 100644 --- a/sw/uiconfig/swform/toolbar/moreformcontrols.xml +++ b/sw/uiconfig/swform/toolbar/moreformcontrols.xml @@ -27,6 +27,8 @@ - - + + + + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: officecfg/registry
officecfg/registry/data/org/openoffice/Office/Accelerators.xcu |8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) New commits: commit 532576461654eaf43120d2f693172c07a41275fa Author: Yousuf Philips <philip...@hotmail.com> Date: Sun Jan 28 19:52:42 2018 +0400 tdf#114858 Use Ctrl+` for Formula Toggle on Mac Change-Id: I0685eb0d1f6ea7c8502bbaa22f0e90004947282d Reviewed-on: https://gerrit.libreoffice.org/48793 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Yousuf Philips <philip...@hotmail.com> diff --git a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu index b3f195413c17..6e9182150a56 100644 --- a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu +++ b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu @@ -1080,7 +1080,13 @@ I10N SHORTCUTS - NO TRANSLATE -.uno:ToggleFormula +.uno:ToggleFormula + + + + +I10N SHORTCUTS - NO TRANSLATE +.uno:ToggleFormula ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - sw/uiconfig
sw/uiconfig/swriter/ui/notebookbar_single.ui |4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) New commits: commit fabb533e06c6c3732bf38544faad30b048c6c627 Author: Yousuf Philips <philip...@hotmail.com> Date: Fri Feb 9 16:34:15 2018 +0400 Notebookbar Single: Fix context glitch and spacing Change-Id: I9417b45b190bab746e5f9fa08b7076b4488bcf16 Reviewed-on: https://gerrit.libreoffice.org/49492 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Yousuf Philips <philip...@hotmail.com> (cherry picked from commit 71efbe9244818ae5a4245e7c7854b81fbafd16f7) Reviewed-on: https://gerrit.libreoffice.org/49618 Reviewed-by: andreas_kainz <kain...@gmail.com> diff --git a/sw/uiconfig/swriter/ui/notebookbar_single.ui b/sw/uiconfig/swriter/ui/notebookbar_single.ui index 7266c9019dbc..e75440e41e2a 100644 --- a/sw/uiconfig/swriter/ui/notebookbar_single.ui +++ b/sw/uiconfig/swriter/ui/notebookbar_single.ui @@ -20,6 +20,8 @@ True False center +6 +6 3 @@ -761,7 +763,7 @@ - <class name="context-Text"/> + <class name="context-any"/> ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/uiconfig
sw/uiconfig/swriter/ui/notebookbar_single.ui |4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) New commits: commit 71efbe9244818ae5a4245e7c7854b81fbafd16f7 Author: Yousuf Philips <philip...@hotmail.com> Date: Fri Feb 9 16:34:15 2018 +0400 Notebookbar Single: Fix context glitch and spacing Change-Id: I9417b45b190bab746e5f9fa08b7076b4488bcf16 Reviewed-on: https://gerrit.libreoffice.org/49492 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Yousuf Philips <philip...@hotmail.com> diff --git a/sw/uiconfig/swriter/ui/notebookbar_single.ui b/sw/uiconfig/swriter/ui/notebookbar_single.ui index 7266c9019dbc..e75440e41e2a 100644 --- a/sw/uiconfig/swriter/ui/notebookbar_single.ui +++ b/sw/uiconfig/swriter/ui/notebookbar_single.ui @@ -20,6 +20,8 @@ True False center +6 +6 3 @@ -761,7 +763,7 @@ - <class name="context-Text"/> + <class name="context-any"/> ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/uiconfig
sw/uiconfig/sglobal/menubar/menubar.xml | 139 +--- 1 file changed, 78 insertions(+), 61 deletions(-) New commits: commit 18d78dac064bdb16c54c89563d8df22803e84083 Author: Yousuf Philips <philip...@hotmail.com> Date: Thu Feb 8 01:10:34 2018 +0400 tdf#103733 Unify writer master doc menu with writer Change-Id: I147544acc2b783538f5a69fd0cdad1837b0abbd0 Reviewed-on: https://gerrit.libreoffice.org/49395 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Yousuf Philips <philip...@hotmail.com> diff --git a/sw/uiconfig/sglobal/menubar/menubar.xml b/sw/uiconfig/sglobal/menubar/menubar.xml index 614025b0fa5d..ab133daf836c 100644 --- a/sw/uiconfig/sglobal/menubar/menubar.xml +++ b/sw/uiconfig/sglobal/menubar/menubar.xml @@ -20,7 +20,7 @@ - + @@ -48,7 +48,14 @@ - + + + + + + + + @@ -118,7 +125,9 @@ + + @@ -156,8 +165,8 @@ - - + + @@ -196,7 +205,7 @@ - + @@ -222,7 +231,14 @@ - + + + + + + + + @@ -266,7 +282,9 @@ - + + + @@ -278,6 +296,7 @@ + @@ -321,41 +340,8 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -452,10 +438,10 @@ - - + + @@ -503,12 +489,6 @@ - - - - - - @@ -519,6 +499,8 @@ + + @@ -572,8 +554,6 @@ - - @@ -585,7 +565,10 @@ + + + @@ -664,6 +647,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -697,16 +724,6 @@ - - - - - - - - - - ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/uiconfig
sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit bbc4f9fee81656c618329cee088d9eedd9a1c457 Author: Yousuf Philips <philip...@hotmail.com> Date: Fri Feb 9 14:34:51 2018 +0400 tdf#114299 Ensure groupedbar full works in print preview mode Change-Id: I154d22deeafc76e6afff9ccf5cbd5f8aa9ec3a57 Reviewed-on: https://gerrit.libreoffice.org/49480 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Yousuf Philips <philip...@hotmail.com> diff --git a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui index 89c5c5716f65..0cc438bfc166 100644 --- a/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui +++ b/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui @@ -6117,7 +6117,7 @@ <class name="context-Text"/> - <class name="context-Default"/> + <class name="context-default"/> ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/uiconfig
sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui |6 +++--- sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui|2 +- 2 files changed, 4 insertions(+), 4 deletions(-) New commits: commit 10a7dddf65b4fd9716bd8815debfa1cdd4ac184c Author: Yousuf Philips <philip...@hotmail.com> Date: Fri Feb 9 14:25:11 2018 +0400 tdf#114972 Make insert textbox work in Impress grouped notebookbars Change-Id: I35a7efeec01a6aeae5bc4bcb49151cba1d225d61 Reviewed-on: https://gerrit.libreoffice.org/49481 Reviewed-by: andreas_kainz <kain...@gmail.com> Tested-by: andreas_kainz <kain...@gmail.com> Reviewed-by: Yousuf Philips <philip...@hotmail.com> diff --git a/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui b/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui index 1af82ac25c3d..5e1b3f0d7e1b 100644 --- a/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui +++ b/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui @@ -3137,7 +3137,7 @@ True False -.uno:DrawText +.uno:Text False @@ -4473,7 +4473,7 @@ True False -.uno:DrawText +.uno:Text False @@ -6112,7 +6112,7 @@ True False -.uno:DrawText +.uno:Text False diff --git a/sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui b/sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui index 402b9bb67929..43102d2b1e9a 100644 --- a/sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui +++ b/sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui @@ -3936,7 +3936,7 @@ True False -.uno:DrawText +.uno:Text True ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: dictionaries
dictionaries |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 9bc78950b5e68eba000b1e76b6f61104288f30fe Author: Yousuf Philips <philip...@hotmail.com> Date: Thu Feb 1 23:11:54 2018 +0400 Updated core Project: dictionaries 476ebd97bbfdcf59f00cd832647b880ddfdfb252 Update arabic dictionary to version 3.5 (2014-11-08) Files extracted from http://sourceforge.net/projects/ayaspell/files/dict_ar-3.5.2014-11-08.oxt/download Change-Id: Ic3ffb861a253f680e96e437b5dc2f3da4e392a21 Reviewed-on: https://gerrit.libreoffice.org/49028 Reviewed-by: Andras Timar <andras.ti...@collabora.com> Tested-by: Andras Timar <andras.ti...@collabora.com> diff --git a/dictionaries b/dictionaries index 96f0ddc0c4dd..476ebd97bbfd 16 --- a/dictionaries +++ b/dictionaries @@ -1 +1 @@ -Subproject commit 96f0ddc0c4ddfc6f9fa1c94d5844469c1911e712 +Subproject commit 476ebd97bbfdcf59f00cd832647b880ddfdfb252 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/uiconfig
sw/uiconfig/swriter/popupmenu/table.xml |5 + sw/uiconfig/swriter/popupmenu/text.xml |5 + 2 files changed, 10 insertions(+) New commits: commit 7f4b7db28d4174d1ccf75c1e8373585060e74b1f Author: Yousuf Philips <philip...@hotmail.com> Date: Sat Jan 20 18:32:31 2018 +0400 tdf#85940 Add basic list styles to context menu Change-Id: I9bdc3f1ba64ed47a6569b93e6685adad47c41718 Reviewed-on: https://gerrit.libreoffice.org/48238 Reviewed-by: Heiko Tietze <tietze.he...@gmail.com> Tested-by: Heiko Tietze <tietze.he...@gmail.com> Reviewed-by: Yousuf Philips <philip...@hotmail.com> diff --git a/sw/uiconfig/swriter/popupmenu/table.xml b/sw/uiconfig/swriter/popupmenu/table.xml index 5d6992de58b6..4bedc921c551 100644 --- a/sw/uiconfig/swriter/popupmenu/table.xml +++ b/sw/uiconfig/swriter/popupmenu/table.xml @@ -82,6 +82,11 @@ + + + + + diff --git a/sw/uiconfig/swriter/popupmenu/text.xml b/sw/uiconfig/swriter/popupmenu/text.xml index 6f689036a5c6..3c020ef793a7 100644 --- a/sw/uiconfig/swriter/popupmenu/text.xml +++ b/sw/uiconfig/swriter/popupmenu/text.xml @@ -53,6 +53,11 @@ + + + + + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-0-0' - download.lst external/more_fonts Makefile.fetch Repository.mk
Makefile.fetch |4
Repository.mk |4
download.lst|8
external/more_fonts/ExternalPackage_amiri.mk| 20
external/more_fonts/ExternalPackage_kacst.mk| 17 +
external/more_fonts/ExternalPackage_reem.mk | 16
external/more_fonts/ExternalPackage_scheherazade.mk | 17 +
external/more_fonts/Module_more_fonts.mk|8
external/more_fonts/UnpackedTarball_amiri.mk| 14 ++
external/more_fonts/UnpackedTarball_kacst.mk| 14 ++
external/more_fonts/UnpackedTarball_reem.mk | 14 ++
external/more_fonts/UnpackedTarball_scheherazade.mk | 14 ++
12 files changed, 150 insertions(+)
New commits:
commit 539e2efa4e6ef82a1a5e9d58cd36a616c73546fc
Author: Yousuf Philips <philip...@hotmail.com>
Date: Thu Dec 21 18:57:02 2017 +0400
tdf#113532 Add Arabic fonts into default installation
Includes these fonts
* Amiri
* KACSTOffice, KACSTBook
* Reem Kufi
* Scheherazade
Change-Id: I2071c4c379b2dc88a205e2c284ae0a65cfdc76c9
Reviewed-on: https://gerrit.libreoffice.org/46624
Reviewed-by: Yousuf Philips <philip...@hotmail.com>
Tested-by: Yousuf Philips <philip...@hotmail.com>
(cherry picked from commit 4eaeb8058d75d03e782d37b430b68890aa374f2c)
Reviewed-on: https://gerrit.libreoffice.org/48012
Reviewed-by: Eike Rathke <er...@redhat.com>
Reviewed-by: Khaled Hosny <khaledho...@eglug.org>
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
Tested-by: Andras Timar <andras.ti...@collabora.com>
diff --git a/Makefile.fetch b/Makefile.fetch
index 33558239eeb8..42a8ca8684f9 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -180,6 +180,10 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk
$(SRCDIR)/download.lst $(S
$(call fetch_Optional,MORE_FONTS,FONT_CULMUS_TARBALL) \
$(call fetch_Optional,MORE_FONTS,FONT_LIBRE_HEBREW_TARBALL) \
$(call fetch_Optional,MORE_FONTS,FONT_ALEF_TARBALL) \
+ $(call fetch_Optional,MORE_FONTS,FONT_AMIRI_TARBALL) \
+ $(call fetch_Optional,MORE_FONTS,FONT_KACST_TARBALL) \
+ $(call fetch_Optional,MORE_FONTS,FONT_REEM_TARBALL) \
+ $(call fetch_Optional,MORE_FONTS,FONT_SCHEHERAZADE_TARBALL) \
$(call fetch_Optional,MSPUB,MSPUB_TARBALL) \
$(call fetch_Optional,MWAW,MWAW_TARBALL) \
$(call
fetch_Optional,MYSQL_CONNECTOR_CPP,MYSQL_CONNECTOR_CPP_TARBALL) \
diff --git a/Repository.mk b/Repository.mk
index 8f5347fac910..92f24a886b98 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -946,19 +946,23 @@ $(eval $(call
gb_Helper_register_packages_for_install,ooo_fonts,\
postprocess_fontconfig) \
$(call gb_Helper_optional,MORE_FONTS,\
fonts_alef \
+ fonts_amiri \
fonts_caladea \
fonts_carlito \
fonts_culmus \
fonts_dejavu \
fonts_emojione_color \
fonts_gentium \
+ fonts_kacst \
fonts_liberation \
fonts_liberation_narrow \
fonts_libertineg \
fonts_libre_hebrew \
fonts_noto \
+ fonts_reem \
fonts_sourcecode \
fonts_sourcesans \
+ fonts_scheherazade \
) \
))
diff --git a/download.lst b/download.lst
index f96ddba2582d..4ff5737e3540 100644
--- a/download.lst
+++ b/download.lst
@@ -76,6 +76,14 @@ export FONT_LIBRE_HEBREW_SHA256SUM :=
f596257c1db706ce35795b18d7f66a4db99d427725
export FONT_LIBRE_HEBREW_TARBALL := libre-hebrew-1.0.tar.gz
export FONT_ALEF_SHA256SUM :=
b98b67602a2c8880a1770f0b9e37c190f29a7e2ade5616784f0b89fbdb75bf52
export FONT_ALEF_TARBALL := alef-1.001.tar.gz
+export FONT_AMIRI_SHA256SUM :=
97ee6e40d87f4b31de15d9a93bb30bf27bf308f0814f4ee9c47365b027402ad6
+export FONT_AMIRI_TARBALL := amiri-0.109.zip
+export FONT_KACST_SHA256SUM :=
dca00f5e655f2f217a766faa73a81f542c5c204aa3a47017c3c2be0b31d00a56
+export FONT_KACST_TARBALL := ttf-kacst_2.01+mry.tar.gz
+export FONT_REEM_SHA256SUM :=
4dfbd8b227ea062ca1742fb15d707f0b74398f9ddb231892554f0959048e809b
+export FONT_REEM_TARBALL := ReemKufi-0.6.tar.gz
+export FONT_SCHEHERAZADE_SHA256SUM :=
251c8817ceb87d9b661ce1d5b49e732a0116add10abc046be4b8ba5196e149b5
+export FONT_SCHEHERAZADE_TARBALL := Scheherazade-2.100.zip
export FREEHAND_SHA256SUM :=
0e422d1564a6dbf22a9af598535425271e583514c0f7ba7d9091676420de34ac
export FREEHAND_TARBALL := libfreehand-0.1.2.tar.xz
export FREETYPE_SHA256SUM :=
e5435f02e02d2b87bb8e4efdcaa14b1f78c9cf3ab1ed80f94b6382f
[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - download.lst external/more_fonts Makefile.fetch Repository.mk
Makefile.fetch |4
Repository.mk |4
download.lst|8
external/more_fonts/ExternalPackage_amiri.mk| 20
external/more_fonts/ExternalPackage_kacst.mk| 17 +
external/more_fonts/ExternalPackage_reem.mk | 16
external/more_fonts/ExternalPackage_scheherazade.mk | 17 +
external/more_fonts/Module_more_fonts.mk|8
external/more_fonts/UnpackedTarball_amiri.mk| 14 ++
external/more_fonts/UnpackedTarball_kacst.mk| 14 ++
external/more_fonts/UnpackedTarball_reem.mk | 14 ++
external/more_fonts/UnpackedTarball_scheherazade.mk | 14 ++
12 files changed, 150 insertions(+)
New commits:
commit 26c4a36cad9aca8e07abcbfeddf744ae112a4bc0
Author: Yousuf Philips <philip...@hotmail.com>
Date: Thu Dec 21 18:57:02 2017 +0400
tdf#113532 Add Arabic fonts into default installation
Includes these fonts
* Amiri
* KACSTOffice, KACSTBook
* Reem Kufi
* Scheherazade
Change-Id: I2071c4c379b2dc88a205e2c284ae0a65cfdc76c9
Reviewed-on: https://gerrit.libreoffice.org/46624
Reviewed-by: Yousuf Philips <philip...@hotmail.com>
Tested-by: Yousuf Philips <philip...@hotmail.com>
(cherry picked from commit 4eaeb8058d75d03e782d37b430b68890aa374f2c)
Reviewed-on: https://gerrit.libreoffice.org/46955
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Khaled Hosny <khaledho...@eglug.org>
diff --git a/Makefile.fetch b/Makefile.fetch
index 33558239eeb8..42a8ca8684f9 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -180,6 +180,10 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk
$(SRCDIR)/download.lst $(S
$(call fetch_Optional,MORE_FONTS,FONT_CULMUS_TARBALL) \
$(call fetch_Optional,MORE_FONTS,FONT_LIBRE_HEBREW_TARBALL) \
$(call fetch_Optional,MORE_FONTS,FONT_ALEF_TARBALL) \
+ $(call fetch_Optional,MORE_FONTS,FONT_AMIRI_TARBALL) \
+ $(call fetch_Optional,MORE_FONTS,FONT_KACST_TARBALL) \
+ $(call fetch_Optional,MORE_FONTS,FONT_REEM_TARBALL) \
+ $(call fetch_Optional,MORE_FONTS,FONT_SCHEHERAZADE_TARBALL) \
$(call fetch_Optional,MSPUB,MSPUB_TARBALL) \
$(call fetch_Optional,MWAW,MWAW_TARBALL) \
$(call
fetch_Optional,MYSQL_CONNECTOR_CPP,MYSQL_CONNECTOR_CPP_TARBALL) \
diff --git a/Repository.mk b/Repository.mk
index 8f5347fac910..92f24a886b98 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -946,19 +946,23 @@ $(eval $(call
gb_Helper_register_packages_for_install,ooo_fonts,\
postprocess_fontconfig) \
$(call gb_Helper_optional,MORE_FONTS,\
fonts_alef \
+ fonts_amiri \
fonts_caladea \
fonts_carlito \
fonts_culmus \
fonts_dejavu \
fonts_emojione_color \
fonts_gentium \
+ fonts_kacst \
fonts_liberation \
fonts_liberation_narrow \
fonts_libertineg \
fonts_libre_hebrew \
fonts_noto \
+ fonts_reem \
fonts_sourcecode \
fonts_sourcesans \
+ fonts_scheherazade \
) \
))
diff --git a/download.lst b/download.lst
index f96ddba2582d..4ff5737e3540 100644
--- a/download.lst
+++ b/download.lst
@@ -76,6 +76,14 @@ export FONT_LIBRE_HEBREW_SHA256SUM :=
f596257c1db706ce35795b18d7f66a4db99d427725
export FONT_LIBRE_HEBREW_TARBALL := libre-hebrew-1.0.tar.gz
export FONT_ALEF_SHA256SUM :=
b98b67602a2c8880a1770f0b9e37c190f29a7e2ade5616784f0b89fbdb75bf52
export FONT_ALEF_TARBALL := alef-1.001.tar.gz
+export FONT_AMIRI_SHA256SUM :=
97ee6e40d87f4b31de15d9a93bb30bf27bf308f0814f4ee9c47365b027402ad6
+export FONT_AMIRI_TARBALL := amiri-0.109.zip
+export FONT_KACST_SHA256SUM :=
dca00f5e655f2f217a766faa73a81f542c5c204aa3a47017c3c2be0b31d00a56
+export FONT_KACST_TARBALL := ttf-kacst_2.01+mry.tar.gz
+export FONT_REEM_SHA256SUM :=
4dfbd8b227ea062ca1742fb15d707f0b74398f9ddb231892554f0959048e809b
+export FONT_REEM_TARBALL := ReemKufi-0.6.tar.gz
+export FONT_SCHEHERAZADE_SHA256SUM :=
251c8817ceb87d9b661ce1d5b49e732a0116add10abc046be4b8ba5196e149b5
+export FONT_SCHEHERAZADE_TARBALL := Scheherazade-2.100.zip
export FREEHAND_SHA256SUM :=
0e422d1564a6dbf22a9af598535425271e583514c0f7ba7d9091676420de34ac
export FREEHAND_TARBALL := libfreehand-0.1.2.tar.xz
export FREETYPE_SHA256SUM :=
e5435f02e02d2b87bb8e4efdcaa14b1f78c9cf3ab1ed80f94b6382fb6acc7d78
diff --git a/external/more_fonts/ExternalPackage_amiri.mk
b/external/more_fonts/ExternalPackage_amiri.mk
new file mode 100644
in
[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - sd/uiconfig
sd/uiconfig/simpress/ui/slidetransitionspanel.ui | 16 ++-- 1 file changed, 14 insertions(+), 2 deletions(-) New commits: commit 20b6a86414cd6888185d95cd480fc95f8fc0e6b0 Author: Yousuf Philips <philip...@hotmail.com> Date: Wed Jan 3 18:51:32 2018 +0400 tdf#113880 improve slide transition sidebar deck * added padding around transition list control * make controls in 'modify transition' accessible * correct alignment of variant label Change-Id: I129e387be1458b7f08fab7f460d9ae60cd5dd391 Reviewed-on: https://gerrit.libreoffice.org/47320 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Katarina Behrens <katarina.behr...@cib.de> (cherry picked from commit 0e5070b97fc0e2314af235809d2ebe37075ef188) Reviewed-on: https://gerrit.libreoffice.org/47601 diff --git a/sd/uiconfig/simpress/ui/slidetransitionspanel.ui b/sd/uiconfig/simpress/ui/slidetransitionspanel.ui index 75a38cb89cc3..78c8f4dac49c 100644 --- a/sd/uiconfig/simpress/ui/slidetransitionspanel.ui +++ b/sd/uiconfig/simpress/ui/slidetransitionspanel.ui @@ -2,6 +2,7 @@ + True False @@ -30,7 +31,12 @@ False True True - +6 +6 +6 + + + False @@ -69,6 +75,8 @@ False end Duration: +True +transition_duration:0.00sec 0 @@ -83,7 +91,6 @@ True Select the speed of Slide Transition. True -adjustment1 1 @@ -96,6 +103,8 @@ False end Sound: +True +sound_list 0 @@ -136,7 +145,10 @@ True False +end Variant: +True +variant_list 0 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: officecfg/registry
officecfg/registry/data/org/openoffice/VCL.xcu | 54 - 1 file changed, 27 insertions(+), 27 deletions(-) New commits: commit 847d20b3466a6358396c923e9b4754cbdd53863a Author: Yousuf Philips <philip...@hotmail.com> Date: Sun Dec 31 04:18:32 2017 +0400 tdf#114768: Update default font list for Traditional Chinese * Add Noto Sans/Serif CJK as alias for Source Han Sans/Serif * Order lists into open source, mac, windows and fallback * Add missing english names for localized names * Trim list of fallback fonts Change-Id: I7eb0b5bd54eb4625d6d605a2bc649c48411462ab Reviewed-on: https://gerrit.libreoffice.org/47191 Reviewed-by: Cheng-Chia Tseng <pswo10...@gmail.com> Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Mark Hung <mark...@gmail.com> diff --git a/officecfg/registry/data/org/openoffice/VCL.xcu b/officecfg/registry/data/org/openoffice/VCL.xcu index d759ef68509f..ab30b58d755d 100644 --- a/officecfg/registry/data/org/openoffice/VCL.xcu +++ b/officecfg/registry/data/org/openoffice/VCL.xcu @@ -275,89 +275,89 @@ -ææºé»é« HW;ç´°æé«;MingLiU;ææ³é©ç寬微米é»;Liberation Mono;Cumberland AMT;Cumberland;Courier New;Nimbus Mono L;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced +ææºé»é« HW;Source Han Sans HW;Noto Sans Mono CJK TC;ç´°æé«;MingLiU;Liberation Mono;Menlo;Courier New;Monospaced -ææºé»é«;èæ¹-ç¹;PingFang TC;å·é» Pro;LiHei Pro;å¾®è»æ£é»é«;ææ³é©å¾®ç±³é»;Hei;æ°ç´°æé«;PMingLiU;Ming;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma +ææºé»é«;Source Han Sans;Noto Sans CJK TC;èæ¹-ç¹;PingFang TC;å·é» Pro;LiHei Pro;å¾®è»æ£é»é«;Microsoft JhengHei;æ°ç´°æé«;PMingLiU;Arial Unicode MS;Liberation Sans;Tahoma -ææºé»é«;èæ¹-ç¹;PingFang TC;å·é» Pro;LiHei Pro;å¾®è»æ£é»é«;ææ³é©å¾®ç±³é»;Hei;æ°ç´°æé«;PMingLiU;Ming;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma +ææºé»é«;Source Han Sans;Noto Sans CJK TC;èæ¹-ç¹;PingFang TC;å·é» Pro;LiHei Pro;å¾®è»æ£é»é«;Microsoft JhengHei;æ°ç´°æé«;PMingLiU;Arial Unicode MS;Liberation Sans;Tahoma -ææºé»é«;èæ¹-ç¹;PingFang TC;å·é» Pro;LiHei Pro;å¾®è»æ£é»é«;ææ³é©å¾®ç±³é»;Hei;æ°ç´°æé«;PMingLiU;Ming;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma +ææºé»é«;Source Han Sans;Noto Sans CJK TC;èæ¹-ç¹;PingFang TC;å·é» Pro;LiHei Pro;å¾®è»æ£é»é«;Microsoft JhengHei;æ°ç´°æé«;PMingLiU;Arial Unicode MS;Liberation Sans;Tahoma -ææºé»é«;èæ¹-ç¹;PingFang TC;å·é» Pro;LiHei Pro;å¾®è»æ£é»é«;ææ³é©å¾®ç±³é»;Hei;æ°ç´°æé«;PMingLiU;Ming;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma +ææºé»é«;Source Han Sans;Noto Sans CJK TC;èæ¹-ç¹;PingFang TC;å·é» Pro;LiHei Pro;å¾®è»æ£é»é«;Microsoft JhengHei;æ°ç´°æé«;PMingLiU;Arial Unicode MS;Liberation Sans;Tahoma -ææºå®é«;å®é«-ç¹;Songti TC;å·å® Pro;LiSong Pro;æ°ç´°æé«;PMingLiU;AR PL UMing TW;Ming;Song;Sung;Andale Sans UI;Arial Unicode MS;Lucida Sans Unicode;Tahoma +ææºå®é«;Source Han Serif;Noto Serif CJK TC;å®é«-ç¹;Songti TC;å·å® Pro;LiSong Pro;æ°ç´°æé«;PMingLiU;Arial Unicode MS;Liberation Sans;Tahoma -ææºé»é« HW;ç´°æé«;MingLiU;ææ³é©ç寬微米é»;Liberation Mono;Cumberland AMT;Cumberland;Courier New;Nimbus Mono L;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced +ææºé»é« HW;Source Han Sans HW;Noto Sans Mono CJK TC;ç´°æé«;MingLiU;Liberation Mono;Menlo;Courier New;Monospaced -ææºé»é« HW;ç´°æé«;MingLiU;ææ³é©ç寬微米é»;Liberation Mono;Cumberland AMT;Cumberland;Courier New;Nimbus Mono L;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced +ææºé»é« HW;Source Han Sans HW;Noto Sans Mono CJK TC;ç´°æé«;MingLiU;Liberation Mono;Menlo;Courier New;Monospaced -ææºé»é«;èæ¹-ç¹;PingFang TC;å·é» Pro;LiHei Pro;å¾®è»æ£é»é«;ææ³é©å¾®ç±³é»;Hei;æ°ç´°æé«;PMingLiU;Andale Sans UI;Arial Unicode MS;Ming;gnu-unifont;Interface User;WarpSans;Geneva;Tahoma;MS Sans Serif;Helv;Dialog;Albany AMT;Albany;Lucida;Arial;Nimbus Sans L;Helvetica;Charcoal;Chicago;Helmet;Interface System;Sans Serif +ææºé»é«;Source Han Sans;Noto Sans CJK TC;èæ¹-ç¹;PingFang TC;å·é» Pro;LiHei Pro;å¾®è»æ£é»é«;Microsoft JhengHei;æ°ç´°æé«;PMingLiU;Segoe UI;Tahoma;San Francisco;Lucida Grande;Sans Serif -ææºé»é« HW;ç´°æé«;MingLiU;ææ³é©ç寬微米é»;Liberation Mono;Cumberland AMT;Cumberland;Courier New;Nimbus Mono L;Courier;Lucida Sans Typewriter;Lucida Typewriter;Monaco;Monospaced
[Libreoffice-commits] core.git: sd/uiconfig
sd/uiconfig/simpress/ui/slidetransitionspanel.ui | 16 ++-- 1 file changed, 14 insertions(+), 2 deletions(-) New commits: commit 0e5070b97fc0e2314af235809d2ebe37075ef188 Author: Yousuf Philips <philip...@hotmail.com> Date: Wed Jan 3 18:51:32 2018 +0400 tdf#113880 improve slide transition sidebar deck * added padding around transition list control * make controls in 'modify transition' accessible * correct alignment of variant label Change-Id: I129e387be1458b7f08fab7f460d9ae60cd5dd391 Reviewed-on: https://gerrit.libreoffice.org/47320 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Katarina Behrens <katarina.behr...@cib.de> diff --git a/sd/uiconfig/simpress/ui/slidetransitionspanel.ui b/sd/uiconfig/simpress/ui/slidetransitionspanel.ui index 75a38cb89cc3..78c8f4dac49c 100644 --- a/sd/uiconfig/simpress/ui/slidetransitionspanel.ui +++ b/sd/uiconfig/simpress/ui/slidetransitionspanel.ui @@ -2,6 +2,7 @@ + True False @@ -30,7 +31,12 @@ False True True - +6 +6 +6 + + + False @@ -69,6 +75,8 @@ False end Duration: +True +transition_duration:0.00sec 0 @@ -83,7 +91,6 @@ True Select the speed of Slide Transition. True -adjustment1 1 @@ -96,6 +103,8 @@ False end Sound: +True +sound_list 0 @@ -136,7 +145,10 @@ True False +end Variant: +True +variant_list 0 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - officecfg/registry
officecfg/registry/data/org/openoffice/VCL.xcu | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) New commits: commit 3fa4794014fe98270f564bd8b1ca4d9c8f62e909 Author: Yousuf Philips <philip...@hotmail.com> Date: Sat Dec 16 17:35:03 2017 +0400 tdf#113538 New font order for hebrew fonts Change-Id: I6e820886204a53de3b29f30b42bb6503cfcc8e35 Reviewed-on: https://gerrit.libreoffice.org/45065 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Yousuf Philips <philip...@hotmail.com> (cherry picked from commit a2158c6ca2ba831665019827889f01e98dc93394) Reviewed-on: https://gerrit.libreoffice.org/47168 Reviewed-by: Lior Kaplan <kaplanl...@gmail.com> diff --git a/officecfg/registry/data/org/openoffice/VCL.xcu b/officecfg/registry/data/org/openoffice/VCL.xcu index e47e4134a449..d759ef68509f 100644 --- a/officecfg/registry/data/org/openoffice/VCL.xcu +++ b/officecfg/registry/data/org/openoffice/VCL.xcu @@ -177,19 +177,19 @@ Tahoma;Arial Unicode MS;Lucida Sans Unicode;DejaVu Sans;Albany AMT;Albany;Arial;Nimbus Sans L;Interface User;Geneva;Tahoma;Dialog;Lucida;Helvetica;Helmet;Interface System;Sans Serif -Nachlieli CLM;Miriam CLM;Ellinia CLM;Aharoni CLM;Drugulin CLM;Miriam Mono CLM;Lucida Sans Unicode;Arial Unicode MS +Nachlieli CLM;Alef;Noto Sans Hebrew;Liberation Sans;Arial;Arial Hebrew;Lucida Sans Unicode;Lucida Grande;Arial Unicode MS -Nachlieli CLM;Miriam CLM;Ellinia CLM;Aharoni CLM;Drugulin CLM;Miriam Mono CLM;Lucida Sans Unicode;Arial Unicode MS +Nachlieli CLM;Alef;Noto Sans Hebrew;Liberation Sans;Arial;Arial Hebrew;Lucida Sans Unicode;Lucida Grande;Arial Unicode MS -Nachlieli CLM;Miriam CLM;Ellinia CLM;Aharoni CLM;Drugulin CLM;Miriam Mono CLM;Lucida Sans Unicode;Arial Unicode MS +Nachlieli CLM;Alef;Noto Sans Hebrew;Liberation Sans;Arial;Arial Hebrew;Lucida Sans Unicode;Lucida Grande;Arial Unicode MS -Nachlieli CLM;Miriam CLM;Ellinia CLM;Aharoni CLM;Drugulin CLM;Miriam Mono CLM;Lucida Sans Unicode;Arial Unicode MS +Nachlieli CLM;Alef;Noto Sans Hebrew;Liberation Sans;Arial;Arial Hebrew;Lucida Sans Unicode;Lucida Grande;Arial Unicode MS -Nachlieli CLM;Miriam CLM;Ellinia CLM;Aharoni CLM;Drugulin CLM;Miriam Mono CLM;Lucida Sans Unicode;Arial Unicode MS +David Libre;David CLM;Frank Ruehl CLM;Liberation Serif;David;Raanana;Lucida Sans Unicode;Lucida Grande;Arial Unicode MS ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - sw/uiconfig
sw/uiconfig/swriter/toolbar/standardbar.xml |3 ++-
sw/uiconfig/swriter/toolbar/textstylebar.xml |9 ++---
2 files changed, 8 insertions(+), 4 deletions(-)
New commits:
commit 71604ca2ecebb78af6b8bb6b3ec1d9deae19dd1b
Author: Yousuf Philips <philip...@hotmail.com>
Date: Tue Dec 19 03:56:19 2017 +0400
Writer: Restore old symbol button and add new numbering styles
Change-Id: I458ad3fe6c19cd5c65a4beb4758e0ac9aba630a4
Reviewed-on: https://gerrit.libreoffice.org/46757
Reviewed-by: Yousuf Philips <philip...@hotmail.com>
Tested-by: Yousuf Philips <philip...@hotmail.com>
(cherry picked from commit 490287a1b22411f4ac32127c93228e06dad4ff22)
Reviewed-on: https://gerrit.libreoffice.org/46878
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Heiko Tietze <tietze.he...@gmail.com>
Tested-by: Heiko Tietze <tietze.he...@gmail.com>
diff --git a/sw/uiconfig/swriter/toolbar/standardbar.xml
b/sw/uiconfig/swriter/toolbar/standardbar.xml
index 10c5b6edf05b..386aef671eb1 100644
--- a/sw/uiconfig/swriter/toolbar/standardbar.xml
+++ b/sw/uiconfig/swriter/toolbar/standardbar.xml
@@ -60,8 +60,9 @@
+
+
-
diff --git a/sw/uiconfig/swriter/toolbar/textstylebar.xml
b/sw/uiconfig/swriter/toolbar/textstylebar.xml
index 7aa997f75984..8b1706705b27 100644
--- a/sw/uiconfig/swriter/toolbar/textstylebar.xml
+++ b/sw/uiconfig/swriter/toolbar/textstylebar.xml
@@ -73,9 +73,12 @@
-
-
-
+
+
+
+
+
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - officecfg/registry
officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu | 42 ++ 1 file changed, 42 insertions(+) New commits: commit 023949fac0043408ac1b86dc67732666d041875e Author: Yousuf Philips <philip...@hotmail.com> Date: Fri Dec 22 13:27:38 2017 +0400 tdf#114605 Allow line split buttons to work in the menus Change-Id: Ie6cb2b19c56cb5b38f1dca89dba775970f405748 Reviewed-on: https://gerrit.libreoffice.org/46905 Reviewed-by: Maxim Monastirsky <momonas...@gmail.com> Tested-by: Jenkins <c...@libreoffice.org> (cherry picked from commit eb5c30450e1966caf476dbbc63669b1593d5c5a7) Reviewed-on: https://gerrit.libreoffice.org/47014 Reviewed-by: Heiko Tietze <tietze.he...@googlemail.com> diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu index 103d14d1f672..12d7ccd3de91 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu @@ -439,6 +439,48 @@ preview + + + .uno:ArrowsToolbox + + + + + + com.sun.star.comp.framework.ToolbarAsMenuController + + + arrowsbar + + + + + .uno:LineToolbox + + + + + + com.sun.star.comp.framework.ToolbarAsMenuController + + + linesbar + + + + + .uno:ConnectorToolbox + + + + + + com.sun.star.comp.framework.ToolbarAsMenuController + + + connectorsbar + + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - officecfg/registry
officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit aeb7e997b41501410fbffd78ced63c5344ccb101
Author: Yousuf Philips <philip...@hotmail.com>
Date: Thu Dec 21 03:45:37 2017 +0400
Fix labels for page-related group button entries
Change-Id: Ia6ed455cc7b5e41895950a22b8d75284c847ebee
Reviewed-on: https://gerrit.libreoffice.org/46873
Reviewed-by: Yousuf Philips <philip...@hotmail.com>
Tested-by: Yousuf Philips <philip...@hotmail.com>
(cherry picked from commit ca1bcb40ea27492c0f3a452c4a318b540a9ff09c)
Reviewed-on: https://gerrit.libreoffice.org/46876
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Sophie Gautier <gautier.sop...@gmail.com>
diff --git
a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index c0071633ec82..c842f5a30cc3 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -1106,7 +1106,7 @@
- Page Column Type
+ Page Columns
1
@@ -3245,7 +3245,7 @@
- Page Margin
+ Page Margins
1
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - sd/uiconfig
sd/uiconfig/simpress/popupmenu/pagepane.xml |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 4ca94f24995c8d7b854e2d98fd7ff8fa7b9e2157 Author: Yousuf Philips <philip...@hotmail.com> Date: Thu Dec 21 15:44:24 2017 +0400 Correct impress slide pane popup Navigate label Change-Id: Idd582e4559cd6bd1005de0d8158e57d40ddd3c98 Reviewed-on: https://gerrit.libreoffice.org/46903 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Yousuf Philips <philip...@hotmail.com> (cherry picked from commit 86fc5440dd2b4634635202c09d1e6240909d68f7) Reviewed-on: https://gerrit.libreoffice.org/46917 Reviewed-by: Maxim Monastirsky <momonas...@gmail.com> diff --git a/sd/uiconfig/simpress/popupmenu/pagepane.xml b/sd/uiconfig/simpress/popupmenu/pagepane.xml index 98ac0c7dfbea..f790b402 100644 --- a/sd/uiconfig/simpress/popupmenu/pagepane.xml +++ b/sd/uiconfig/simpress/popupmenu/pagepane.xml @@ -44,7 +44,7 @@ - + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: officecfg/registry
officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu | 42 ++ 1 file changed, 42 insertions(+) New commits: commit eb5c30450e1966caf476dbbc63669b1593d5c5a7 Author: Yousuf Philips <philip...@hotmail.com> Date: Fri Dec 22 13:27:38 2017 +0400 tdf#114605 Allow line split buttons to work in the menus Change-Id: Ie6cb2b19c56cb5b38f1dca89dba775970f405748 Reviewed-on: https://gerrit.libreoffice.org/46905 Reviewed-by: Maxim Monastirsky <momonas...@gmail.com> Tested-by: Jenkins <c...@libreoffice.org> diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu index 103d14d1f672..12d7ccd3de91 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu @@ -439,6 +439,48 @@ preview + + + .uno:ArrowsToolbox + + + + + + com.sun.star.comp.framework.ToolbarAsMenuController + + + arrowsbar + + + + + .uno:LineToolbox + + + + + + com.sun.star.comp.framework.ToolbarAsMenuController + + + linesbar + + + + + .uno:ConnectorToolbox + + + + + + com.sun.star.comp.framework.ToolbarAsMenuController + + + connectorsbar + + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: officecfg/registry sd/uiconfig
officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu | 25 sd/uiconfig/sdraw/menubar/menubar.xml| 454 +++--- 2 files changed, 348 insertions(+), 131 deletions(-) New commits: commit 7e53bd35e8f8669fdeb095f8ec1a4848ffc5f507 Author: Yousuf Philips <philip...@hotmail.com> Date: Thu Dec 21 03:16:02 2017 +0400 tdf#95827 Reorganize draw's menu bar Change-Id: Ied9be2da293e6d318548019e29ae4f95e568144a Reviewed-on: https://gerrit.libreoffice.org/46867 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Yousuf Philips <philip...@hotmail.com> diff --git a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu index 41ccadb46db6..cc507509940e 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu @@ -24,6 +24,16 @@ S~lide + + + ~Page + + + + + ~Shape + + Move @@ -633,7 +643,7 @@ Format Page - ~Page Properties... + Properties... 1 @@ -728,7 +738,7 @@ - ~File... + Insert Page from File... 1 @@ -949,6 +959,17 @@ 1 + + + Master Page... + + + .uno:PresentationLayout + + + 1 + + Slide Layout diff --git a/sd/uiconfig/sdraw/menubar/menubar.xml b/sd/uiconfig/sdraw/menubar/menubar.xml index fc1d25b9c7b8..a087af9923a1 100644 --- a/sd/uiconfig/sdraw/menubar/menubar.xml +++ b/sd/uiconfig/sdraw/menubar/menubar.xml @@ -23,19 +23,21 @@ + + + + + + + + + - - - - - - - - + + - @@ -45,9 +47,6 @@ - - - @@ -56,19 +55,18 @@ + + + + - - - - - - + @@ -87,19 +85,14 @@ - - - + - - - @@ -111,7 +104,6 @@ - @@ -130,6 +122,7 @@ + @@ -138,8 +131,10 @@ + + @@ -161,10 +156,51 @@ - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@
[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - icon-themes/sifr icon-themes/tango
icon-themes/sifr/cmd/lc_romanlowliststyle.png |binary icon-themes/sifr/cmd/sc_romanlowliststyle.png |binary icon-themes/tango/cmd/lc_alphaliststyle.png|binary icon-themes/tango/cmd/lc_alphalowliststyle.png |binary icon-themes/tango/cmd/lc_romanlowliststyle.png |binary icon-themes/tango/cmd/sc_romanlowliststyle.png |binary 6 files changed New commits: commit bb8fedb5645e2c8103f670f398ee4a3bd5b5bad0 Author: Yousuf Philips <philip...@hotmail.com> Date: Fri Dec 22 04:03:05 2017 +0400 tdf#106781 Add icons for new numbering list styles Change-Id: Idcf13b6479643fb256823a69aad99023de7f7624 Reviewed-on: https://gerrit.libreoffice.org/46943 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Yousuf Philips <philip...@hotmail.com> (cherry picked from commit e62d00db505258ac788958e354b5f928a99d4cad) Reviewed-on: https://gerrit.libreoffice.org/46956 Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com> diff --git a/icon-themes/sifr/cmd/lc_romanlowliststyle.png b/icon-themes/sifr/cmd/lc_romanlowliststyle.png new file mode 100644 index ..af96d6c11642 Binary files /dev/null and b/icon-themes/sifr/cmd/lc_romanlowliststyle.png differ diff --git a/icon-themes/sifr/cmd/sc_romanlowliststyle.png b/icon-themes/sifr/cmd/sc_romanlowliststyle.png new file mode 100644 index ..3c51f8573f19 Binary files /dev/null and b/icon-themes/sifr/cmd/sc_romanlowliststyle.png differ diff --git a/icon-themes/tango/cmd/lc_alphaliststyle.png b/icon-themes/tango/cmd/lc_alphaliststyle.png new file mode 100644 index ..028e29384724 Binary files /dev/null and b/icon-themes/tango/cmd/lc_alphaliststyle.png differ diff --git a/icon-themes/tango/cmd/lc_alphalowliststyle.png b/icon-themes/tango/cmd/lc_alphalowliststyle.png new file mode 100644 index ..4a07016a4f3d Binary files /dev/null and b/icon-themes/tango/cmd/lc_alphalowliststyle.png differ diff --git a/icon-themes/tango/cmd/lc_romanlowliststyle.png b/icon-themes/tango/cmd/lc_romanlowliststyle.png new file mode 100644 index ..302f6d2cc755 Binary files /dev/null and b/icon-themes/tango/cmd/lc_romanlowliststyle.png differ diff --git a/icon-themes/tango/cmd/sc_romanlowliststyle.png b/icon-themes/tango/cmd/sc_romanlowliststyle.png new file mode 100644 index ..d6bd72b87645 Binary files /dev/null and b/icon-themes/tango/cmd/sc_romanlowliststyle.png differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: icon-themes/sifr icon-themes/tango
icon-themes/sifr/cmd/lc_romanlowliststyle.png |binary icon-themes/sifr/cmd/sc_romanlowliststyle.png |binary icon-themes/tango/cmd/lc_alphaliststyle.png|binary icon-themes/tango/cmd/lc_alphalowliststyle.png |binary icon-themes/tango/cmd/lc_romanlowliststyle.png |binary icon-themes/tango/cmd/sc_romanlowliststyle.png |binary 6 files changed New commits: commit e62d00db505258ac788958e354b5f928a99d4cad Author: Yousuf Philips <philip...@hotmail.com> Date: Fri Dec 22 04:03:05 2017 +0400 tdf#106781 Add icons for new numbering list styles Change-Id: Idcf13b6479643fb256823a69aad99023de7f7624 Reviewed-on: https://gerrit.libreoffice.org/46943 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Yousuf Philips <philip...@hotmail.com> diff --git a/icon-themes/sifr/cmd/lc_romanlowliststyle.png b/icon-themes/sifr/cmd/lc_romanlowliststyle.png new file mode 100644 index ..af96d6c11642 Binary files /dev/null and b/icon-themes/sifr/cmd/lc_romanlowliststyle.png differ diff --git a/icon-themes/sifr/cmd/sc_romanlowliststyle.png b/icon-themes/sifr/cmd/sc_romanlowliststyle.png new file mode 100644 index ..3c51f8573f19 Binary files /dev/null and b/icon-themes/sifr/cmd/sc_romanlowliststyle.png differ diff --git a/icon-themes/tango/cmd/lc_alphaliststyle.png b/icon-themes/tango/cmd/lc_alphaliststyle.png new file mode 100644 index ..028e29384724 Binary files /dev/null and b/icon-themes/tango/cmd/lc_alphaliststyle.png differ diff --git a/icon-themes/tango/cmd/lc_alphalowliststyle.png b/icon-themes/tango/cmd/lc_alphalowliststyle.png new file mode 100644 index ..4a07016a4f3d Binary files /dev/null and b/icon-themes/tango/cmd/lc_alphalowliststyle.png differ diff --git a/icon-themes/tango/cmd/lc_romanlowliststyle.png b/icon-themes/tango/cmd/lc_romanlowliststyle.png new file mode 100644 index ..302f6d2cc755 Binary files /dev/null and b/icon-themes/tango/cmd/lc_romanlowliststyle.png differ diff --git a/icon-themes/tango/cmd/sc_romanlowliststyle.png b/icon-themes/tango/cmd/sc_romanlowliststyle.png new file mode 100644 index ..d6bd72b87645 Binary files /dev/null and b/icon-themes/tango/cmd/sc_romanlowliststyle.png differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: officecfg/registry sw/uiconfig
officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |5 + sw/uiconfig/swriter/menubar/menubar.xml |9 - 2 files changed, 13 insertions(+), 1 deletion(-) New commits: commit 993bbae2d43d3e4dea445cccbee3bb16d883af02 Author: Yousuf Philips <philip...@hotmail.com> Date: Thu Dec 21 01:11:01 2017 +0400 tdf#91781 Writer: Add Breaks submenu in Insert menu Change-Id: I6d143aa058bce731493e3f90fe361ee2a0d257f9 Reviewed-on: https://gerrit.libreoffice.org/46865 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Heiko Tietze <tietze.he...@googlemail.com> Reviewed-by: Yousuf Philips <philip...@hotmail.com> diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu index e814b4f64fd3..09e73efd9241 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu @@ -6492,6 +6492,11 @@ Navigate + + + More Breaks + + diff --git a/sw/uiconfig/swriter/menubar/menubar.xml b/sw/uiconfig/swriter/menubar/menubar.xml index df2a37ae796b..cfcc9cd1b908 100644 --- a/sw/uiconfig/swriter/menubar/menubar.xml +++ b/sw/uiconfig/swriter/menubar/menubar.xml @@ -231,7 +231,14 @@ - + + + + + + + + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: download.lst external/more_fonts Makefile.fetch Repository.mk
Makefile.fetch |4
Repository.mk |4
download.lst|8
external/more_fonts/ExternalPackage_amiri.mk| 20
external/more_fonts/ExternalPackage_kacst.mk| 17 +
external/more_fonts/ExternalPackage_reem.mk | 16
external/more_fonts/ExternalPackage_scheherazade.mk | 17 +
external/more_fonts/Module_more_fonts.mk|8
external/more_fonts/UnpackedTarball_amiri.mk| 14 ++
external/more_fonts/UnpackedTarball_kacst.mk| 14 ++
external/more_fonts/UnpackedTarball_reem.mk | 14 ++
external/more_fonts/UnpackedTarball_scheherazade.mk | 14 ++
12 files changed, 150 insertions(+)
New commits:
commit 4eaeb8058d75d03e782d37b430b68890aa374f2c
Author: Yousuf Philips <philip...@hotmail.com>
Date: Thu Dec 21 18:57:02 2017 +0400
tdf#113532 Add Arabic fonts into default installation
Includes these fonts
* Amiri
* KACSTOffice, KACSTBook
* Reem Kufi
* Scheherazade
Change-Id: I2071c4c379b2dc88a205e2c284ae0a65cfdc76c9
Reviewed-on: https://gerrit.libreoffice.org/46624
Reviewed-by: Yousuf Philips <philip...@hotmail.com>
Tested-by: Yousuf Philips <philip...@hotmail.com>
diff --git a/Makefile.fetch b/Makefile.fetch
index 33558239eeb8..42a8ca8684f9 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -180,6 +180,10 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk
$(SRCDIR)/download.lst $(S
$(call fetch_Optional,MORE_FONTS,FONT_CULMUS_TARBALL) \
$(call fetch_Optional,MORE_FONTS,FONT_LIBRE_HEBREW_TARBALL) \
$(call fetch_Optional,MORE_FONTS,FONT_ALEF_TARBALL) \
+ $(call fetch_Optional,MORE_FONTS,FONT_AMIRI_TARBALL) \
+ $(call fetch_Optional,MORE_FONTS,FONT_KACST_TARBALL) \
+ $(call fetch_Optional,MORE_FONTS,FONT_REEM_TARBALL) \
+ $(call fetch_Optional,MORE_FONTS,FONT_SCHEHERAZADE_TARBALL) \
$(call fetch_Optional,MSPUB,MSPUB_TARBALL) \
$(call fetch_Optional,MWAW,MWAW_TARBALL) \
$(call
fetch_Optional,MYSQL_CONNECTOR_CPP,MYSQL_CONNECTOR_CPP_TARBALL) \
diff --git a/Repository.mk b/Repository.mk
index cc540ef4139e..29a6dbc05a3d 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -956,19 +956,23 @@ $(eval $(call
gb_Helper_register_packages_for_install,ooo_fonts,\
postprocess_fontconfig) \
$(call gb_Helper_optional,MORE_FONTS,\
fonts_alef \
+ fonts_amiri \
fonts_caladea \
fonts_carlito \
fonts_culmus \
fonts_dejavu \
fonts_emojione_color \
fonts_gentium \
+ fonts_kacst \
fonts_liberation \
fonts_liberation_narrow \
fonts_libertineg \
fonts_libre_hebrew \
fonts_noto \
+ fonts_reem \
fonts_sourcecode \
fonts_sourcesans \
+ fonts_scheherazade \
) \
))
diff --git a/download.lst b/download.lst
index 21c99fe3082b..81d48e94c356 100644
--- a/download.lst
+++ b/download.lst
@@ -76,6 +76,14 @@ export FONT_LIBRE_HEBREW_SHA256SUM :=
f596257c1db706ce35795b18d7f66a4db99d427725
export FONT_LIBRE_HEBREW_TARBALL := libre-hebrew-1.0.tar.gz
export FONT_ALEF_SHA256SUM :=
b98b67602a2c8880a1770f0b9e37c190f29a7e2ade5616784f0b89fbdb75bf52
export FONT_ALEF_TARBALL := alef-1.001.tar.gz
+export FONT_AMIRI_SHA256SUM :=
97ee6e40d87f4b31de15d9a93bb30bf27bf308f0814f4ee9c47365b027402ad6
+export FONT_AMIRI_TARBALL := amiri-0.109.zip
+export FONT_KACST_SHA256SUM :=
dca00f5e655f2f217a766faa73a81f542c5c204aa3a47017c3c2be0b31d00a56
+export FONT_KACST_TARBALL := ttf-kacst_2.01+mry.tar.gz
+export FONT_REEM_SHA256SUM :=
4dfbd8b227ea062ca1742fb15d707f0b74398f9ddb231892554f0959048e809b
+export FONT_REEM_TARBALL := ReemKufi-0.6.tar.gz
+export FONT_SCHEHERAZADE_SHA256SUM :=
251c8817ceb87d9b661ce1d5b49e732a0116add10abc046be4b8ba5196e149b5
+export FONT_SCHEHERAZADE_TARBALL := Scheherazade-2.100.zip
export FREEHAND_SHA256SUM :=
0e422d1564a6dbf22a9af598535425271e583514c0f7ba7d9091676420de34ac
export FREEHAND_TARBALL := libfreehand-0.1.2.tar.xz
export FREETYPE_SHA256SUM :=
e5435f02e02d2b87bb8e4efdcaa14b1f78c9cf3ab1ed80f94b6382fb6acc7d78
diff --git a/external/more_fonts/ExternalPackage_amiri.mk
b/external/more_fonts/ExternalPackage_amiri.mk
new file mode 100644
index ..ccf5f1c94c8a
--- /dev/null
+++ b/external/more_fonts/ExternalPackage_amiri.mk
@@ -0,0 +1,20 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# Thi
[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - download.lst external/more_fonts
download.lst|4 ++-- external/more_fonts/ExternalPackage_noto.mk | 18 ++ 2 files changed, 20 insertions(+), 2 deletions(-) New commits: commit ae08be01b10d3e7e483f93a1e5ed77354939601d Author: Yousuf Philips <philip...@hotmail.com> Date: Sat Dec 16 16:18:18 2017 +0400 tdf#103080 October 2017 update to Noto fonts In addition to updates to the already bundled fonts, Condensed and Light weights of English Noto Sans and Noto Serif have been added, as well as the addition of the Noto Sans Arabic Change-Id: I72bd7815d678fb4723692eb90d352d012ffe035e Reviewed-on: https://gerrit.libreoffice.org/46596 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Yousuf Philips <philip...@hotmail.com> (cherry picked from commit e45e2c4897933f14c90a65fa74d0ad2a0b620ede) Reviewed-on: https://gerrit.libreoffice.org/46841 Reviewed-by: Eike Rathke <er...@redhat.com> diff --git a/download.lst b/download.lst index 23ba942aa3bf..491b56a0569e 100644 --- a/download.lst +++ b/download.lst @@ -68,8 +68,8 @@ export FONT_SOURCESANS_SHA256SUM := e7bc9a1fec787a529e49f5a26b93dcdcf41506449dfc export FONT_SOURCESANS_TARBALL := edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz export FONT_EMOJIONE_COLOR_SHA256SUM := d1a08f7c10589f22740231017694af0a7a270760c8dec33d8d1c038e2be0a0c7 export FONT_EMOJIONE_COLOR_TARBALL := EmojiOneColor-SVGinOT-1.3.tar.gz -export FONT_NOTO_SHA256SUM := 8a269926a3c88dd14b124b19138b54408938a45ea6e60db65073469f45ae6ac8 -export FONT_NOTO_TARBALL := noto-fonts-20170306.tar.gz +export FONT_NOTO_SHA256SUM := 29acc15a4c4d6b51201ba5d60f303dfbc2e5acbfdb70413c9ae1ed34fa259994 +export FONT_NOTO_TARBALL := noto-fonts-20171024.tar.gz export FONT_CULMUS_SHA256SUM := dcf112cfcccb76328dcfc095f4d7c7f4d2f7e48d0eed5e78b100d1d77ce2ed1b export FONT_CULMUS_TARBALL := culmus-0.131.tar.gz export FONT_LIBRE_HEBREW_SHA256SUM := f596257c1db706ce35795b18d7f66a4db99d427725f20e9384914b534142579a diff --git a/external/more_fonts/ExternalPackage_noto.mk b/external/more_fonts/ExternalPackage_noto.mk index adbb88fd4f6d..dd52ac956265 100644 --- a/external/more_fonts/ExternalPackage_noto.mk +++ b/external/more_fonts/ExternalPackage_noto.mk @@ -15,10 +15,20 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_noto,$(LIBO_SHARE_FOLD NotoMono-Regular.ttf \ NotoNaskhArabic-Bold.ttf \ NotoNaskhArabic-Regular.ttf \ + NotoNaskhArabicUI-Bold.ttf \ + NotoNaskhArabicUI-Regular.ttf \ + NotoSansArabic-Bold.ttf \ + NotoSansArabic-Regular.ttf \ + NotoSansArabicUI-Bold.ttf \ + NotoSansArabicUI-Regular.ttf \ NotoSansArmenian-Bold.ttf \ NotoSansArmenian-Regular.ttf \ NotoSans-Bold.ttf \ NotoSans-BoldItalic.ttf \ + NotoSans-Condensed.ttf \ + NotoSans-CondensedBold.ttf \ + NotoSans-CondensedBoldItalic.ttf \ + NotoSans-CondensedItalic.ttf \ NotoSansGeorgian-Bold.ttf \ NotoSansGeorgian-Regular.ttf \ NotoSansHebrew-Bold.ttf \ @@ -26,12 +36,18 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_noto,$(LIBO_SHARE_FOLD NotoSans-Italic.ttf \ NotoSansLao-Bold.ttf \ NotoSansLao-Regular.ttf \ + NotoSans-Light.ttf \ + NotoSans-LightItalic.ttf \ NotoSansLisu-Regular.ttf \ NotoSans-Regular.ttf \ NotoSerifArmenian-Bold.ttf \ NotoSerifArmenian-Regular.ttf \ NotoSerif-Bold.ttf \ NotoSerif-BoldItalic.ttf \ + NotoSerif-Condensed.ttf \ + NotoSerif-CondensedBold.ttf \ + NotoSerif-CondensedBoldItalic.ttf \ + NotoSerif-CondensedItalic.ttf \ NotoSerifGeorgian-Bold.ttf \ NotoSerifGeorgian-Regular.ttf \ NotoSerifHebrew-Bold.ttf \ @@ -39,6 +55,8 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_noto,$(LIBO_SHARE_FOLD NotoSerif-Italic.ttf \ NotoSerifLao-Bold.ttf \ NotoSerifLao-Regular.ttf \ + NotoSerif-Light.ttf \ + NotoSerif-LightItalic.ttf \ NotoSerif-Regular.ttf \ )) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - sw/uiconfig
sw/uiconfig/sglobal/toolbar/frameobjectbar.xml |2 +- sw/uiconfig/sglobal/toolbar/oleobjectbar.xml |2 +- sw/uiconfig/swriter/toolbar/frameobjectbar.xml |2 +- sw/uiconfig/swriter/toolbar/oleobjectbar.xml |2 +- 4 files changed, 4 insertions(+), 4 deletions(-) New commits: commit e673ca8aae33af5f6fbed31b17613173b3ef2c8a Author: Yousuf Philips <philip...@hotmail.com> Date: Thu Dec 21 06:42:27 2017 +0400 tdf#37697 Fix incorrect toolbar separator Change-Id: I2b42fd785516f6f719ba3853e9694652ad03e850 Reviewed-on: https://gerrit.libreoffice.org/46880 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Yousuf Philips <philip...@hotmail.com> (cherry picked from commit e07937bb4eccda742b03bfa9e7f0eb9d4e899e4e) Reviewed-on: https://gerrit.libreoffice.org/46918 Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com> Tested-by: Adolfo Jayme Barrientos <fit...@ubuntu.com> diff --git a/sw/uiconfig/sglobal/toolbar/frameobjectbar.xml b/sw/uiconfig/sglobal/toolbar/frameobjectbar.xml index 5c293252eaa1..46a6e39fa1cc 100644 --- a/sw/uiconfig/sglobal/toolbar/frameobjectbar.xml +++ b/sw/uiconfig/sglobal/toolbar/frameobjectbar.xml @@ -32,7 +32,7 @@ - + diff --git a/sw/uiconfig/sglobal/toolbar/oleobjectbar.xml b/sw/uiconfig/sglobal/toolbar/oleobjectbar.xml index 6cbf98575801..3824ccee8722 100644 --- a/sw/uiconfig/sglobal/toolbar/oleobjectbar.xml +++ b/sw/uiconfig/sglobal/toolbar/oleobjectbar.xml @@ -32,7 +32,7 @@ - + diff --git a/sw/uiconfig/swriter/toolbar/frameobjectbar.xml b/sw/uiconfig/swriter/toolbar/frameobjectbar.xml index 5c293252eaa1..46a6e39fa1cc 100644 --- a/sw/uiconfig/swriter/toolbar/frameobjectbar.xml +++ b/sw/uiconfig/swriter/toolbar/frameobjectbar.xml @@ -32,7 +32,7 @@ - + diff --git a/sw/uiconfig/swriter/toolbar/oleobjectbar.xml b/sw/uiconfig/swriter/toolbar/oleobjectbar.xml index 6cbf98575801..3824ccee8722 100644 --- a/sw/uiconfig/swriter/toolbar/oleobjectbar.xml +++ b/sw/uiconfig/swriter/toolbar/oleobjectbar.xml @@ -32,7 +32,7 @@ - + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/uiconfig
sd/uiconfig/simpress/popupmenu/pagepane.xml |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 86fc5440dd2b4634635202c09d1e6240909d68f7 Author: Yousuf Philips <philip...@hotmail.com> Date: Thu Dec 21 15:44:24 2017 +0400 Correct impress slide pane popup Navigate label Change-Id: Idd582e4559cd6bd1005de0d8158e57d40ddd3c98 Reviewed-on: https://gerrit.libreoffice.org/46903 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Yousuf Philips <philip...@hotmail.com> diff --git a/sd/uiconfig/simpress/popupmenu/pagepane.xml b/sd/uiconfig/simpress/popupmenu/pagepane.xml index 98ac0c7dfbea..f790b402 100644 --- a/sd/uiconfig/simpress/popupmenu/pagepane.xml +++ b/sd/uiconfig/simpress/popupmenu/pagepane.xml @@ -44,7 +44,7 @@ - + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/uiconfig
sw/uiconfig/sglobal/toolbar/frameobjectbar.xml |2 +- sw/uiconfig/sglobal/toolbar/oleobjectbar.xml |2 +- sw/uiconfig/swriter/toolbar/frameobjectbar.xml |2 +- sw/uiconfig/swriter/toolbar/oleobjectbar.xml |2 +- 4 files changed, 4 insertions(+), 4 deletions(-) New commits: commit e07937bb4eccda742b03bfa9e7f0eb9d4e899e4e Author: Yousuf Philips <philip...@hotmail.com> Date: Thu Dec 21 06:42:27 2017 +0400 tdf#37697 Fix incorrect toolbar separator Change-Id: I2b42fd785516f6f719ba3853e9694652ad03e850 Reviewed-on: https://gerrit.libreoffice.org/46880 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Yousuf Philips <philip...@hotmail.com> diff --git a/sw/uiconfig/sglobal/toolbar/frameobjectbar.xml b/sw/uiconfig/sglobal/toolbar/frameobjectbar.xml index 5c293252eaa1..46a6e39fa1cc 100644 --- a/sw/uiconfig/sglobal/toolbar/frameobjectbar.xml +++ b/sw/uiconfig/sglobal/toolbar/frameobjectbar.xml @@ -32,7 +32,7 @@ - + diff --git a/sw/uiconfig/sglobal/toolbar/oleobjectbar.xml b/sw/uiconfig/sglobal/toolbar/oleobjectbar.xml index 6cbf98575801..3824ccee8722 100644 --- a/sw/uiconfig/sglobal/toolbar/oleobjectbar.xml +++ b/sw/uiconfig/sglobal/toolbar/oleobjectbar.xml @@ -32,7 +32,7 @@ - + diff --git a/sw/uiconfig/swriter/toolbar/frameobjectbar.xml b/sw/uiconfig/swriter/toolbar/frameobjectbar.xml index 5c293252eaa1..46a6e39fa1cc 100644 --- a/sw/uiconfig/swriter/toolbar/frameobjectbar.xml +++ b/sw/uiconfig/swriter/toolbar/frameobjectbar.xml @@ -32,7 +32,7 @@ - + diff --git a/sw/uiconfig/swriter/toolbar/oleobjectbar.xml b/sw/uiconfig/swriter/toolbar/oleobjectbar.xml index 6cbf98575801..3824ccee8722 100644 --- a/sw/uiconfig/swriter/toolbar/oleobjectbar.xml +++ b/sw/uiconfig/swriter/toolbar/oleobjectbar.xml @@ -32,7 +32,7 @@ - + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/uiconfig
sw/uiconfig/swriter/toolbar/standardbar.xml |3 ++-
sw/uiconfig/swriter/toolbar/textstylebar.xml |9 ++---
2 files changed, 8 insertions(+), 4 deletions(-)
New commits:
commit 490287a1b22411f4ac32127c93228e06dad4ff22
Author: Yousuf Philips <philip...@hotmail.com>
Date: Tue Dec 19 03:56:19 2017 +0400
Writer: Restore old symbol button and add new numbering styles
Change-Id: I458ad3fe6c19cd5c65a4beb4758e0ac9aba630a4
Reviewed-on: https://gerrit.libreoffice.org/46757
Reviewed-by: Yousuf Philips <philip...@hotmail.com>
Tested-by: Yousuf Philips <philip...@hotmail.com>
diff --git a/sw/uiconfig/swriter/toolbar/standardbar.xml
b/sw/uiconfig/swriter/toolbar/standardbar.xml
index fa35697ffd94..5b97d40f10b7 100644
--- a/sw/uiconfig/swriter/toolbar/standardbar.xml
+++ b/sw/uiconfig/swriter/toolbar/standardbar.xml
@@ -61,8 +61,9 @@
+
+
-
diff --git a/sw/uiconfig/swriter/toolbar/textstylebar.xml
b/sw/uiconfig/swriter/toolbar/textstylebar.xml
index 7aa997f75984..8b1706705b27 100644
--- a/sw/uiconfig/swriter/toolbar/textstylebar.xml
+++ b/sw/uiconfig/swriter/toolbar/textstylebar.xml
@@ -73,9 +73,12 @@
-
-
-
+
+
+
+
+
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: officecfg/registry
officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit ca1bcb40ea27492c0f3a452c4a318b540a9ff09c
Author: Yousuf Philips <philip...@hotmail.com>
Date: Thu Dec 21 03:45:37 2017 +0400
Fix labels for page-related group button entries
Change-Id: Ia6ed455cc7b5e41895950a22b8d75284c847ebee
Reviewed-on: https://gerrit.libreoffice.org/46873
Reviewed-by: Yousuf Philips <philip...@hotmail.com>
Tested-by: Yousuf Philips <philip...@hotmail.com>
diff --git
a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index 0cff97f27ebb..6069f30543a8 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -1114,7 +1114,7 @@
- Page Column Type
+ Page Columns
1
@@ -3245,7 +3245,7 @@
- Page Margin
+ Page Margins
1
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - 2 commits - download.lst external/more_fonts Makefile.fetch Repository.mk sw/uiconfig
Makefile.fetch |3 +
Repository.mk |3 +
download.lst|6 +++
external/more_fonts/ExternalPackage_alef.mk | 17 ++
external/more_fonts/ExternalPackage_culmus.mk | 33
external/more_fonts/ExternalPackage_libre_hebrew.mk | 25 +++
external/more_fonts/Module_more_fonts.mk|6 +++
external/more_fonts/UnpackedTarball_alef.mk | 14
external/more_fonts/UnpackedTarball_culmus.mk | 14
external/more_fonts/UnpackedTarball_libre_hebrew.mk | 14
sw/uiconfig/swriter/menubar/menubar.xml |8 ++--
11 files changed, 139 insertions(+), 4 deletions(-)
New commits:
commit 85e2a27409f184c8504e61163dc741a31ccc5186
Author: Yousuf Philips <philip...@hotmail.com>
Date: Sat Dec 16 16:55:46 2017 +0400
tdf#113538 Add Hebrew fonts into default installation
Includes these fonts
* Alef
* David CLM
* David Libre
* Frank Ruehl CLM
* Frank Ruhl Hofshi
* Miriam CLM
* Miriam Libre
* Miriam Mono CLM
* Nachlieli CLM
* Rubik
Change-Id: Ib16a30c1f5b8fae372b3f9fc3f6de8a3be55bc85
Reviewed-on: https://gerrit.libreoffice.org/45101
Reviewed-by: Yousuf Philips <philip...@hotmail.com>
Tested-by: Yousuf Philips <philip...@hotmail.com>
Tested-by: Jenkins <c...@libreoffice.org>
(cherry picked from commit 4099b7628405e0ad16844eb59a916aa56ffa76ad)
Reviewed-on: https://gerrit.libreoffice.org/46752
Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
diff --git a/Makefile.fetch b/Makefile.fetch
index e3095eee699f..33558239eeb8 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -177,6 +177,9 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk
$(SRCDIR)/download.lst $(S
$(call fetch_Optional,MORE_FONTS,FONT_SOURCESANS_TARBALL) \
$(call fetch_Optional,MORE_FONTS,FONT_EMOJIONE_COLOR_TARBALL) \
$(call fetch_Optional,MORE_FONTS,FONT_NOTO_TARBALL) \
+ $(call fetch_Optional,MORE_FONTS,FONT_CULMUS_TARBALL) \
+ $(call fetch_Optional,MORE_FONTS,FONT_LIBRE_HEBREW_TARBALL) \
+ $(call fetch_Optional,MORE_FONTS,FONT_ALEF_TARBALL) \
$(call fetch_Optional,MSPUB,MSPUB_TARBALL) \
$(call fetch_Optional,MWAW,MWAW_TARBALL) \
$(call
fetch_Optional,MYSQL_CONNECTOR_CPP,MYSQL_CONNECTOR_CPP_TARBALL) \
diff --git a/Repository.mk b/Repository.mk
index 4bc9a34d87dc..c3ccf4c16142 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -946,14 +946,17 @@ $(eval $(call
gb_Helper_register_packages_for_install,ooo_fonts,\
$(if $(USING_X11)$(ENABLE_HEADLESS)$(filter ANDROID,$(OS)), \
postprocess_fontconfig) \
$(call gb_Helper_optional,MORE_FONTS,\
+ fonts_alef \
fonts_caladea \
fonts_carlito \
+ fonts_culmus \
fonts_dejavu \
fonts_emojione_color \
fonts_gentium \
fonts_liberation \
fonts_liberation_narrow \
fonts_libertineg \
+ fonts_libre_hebrew \
fonts_noto \
fonts_sourcecode \
fonts_sourcesans \
diff --git a/download.lst b/download.lst
index 89f458c015e1..23ba942aa3bf 100644
--- a/download.lst
+++ b/download.lst
@@ -70,6 +70,12 @@ export FONT_EMOJIONE_COLOR_SHA256SUM :=
d1a08f7c10589f22740231017694af0a7a270760
export FONT_EMOJIONE_COLOR_TARBALL := EmojiOneColor-SVGinOT-1.3.tar.gz
export FONT_NOTO_SHA256SUM :=
8a269926a3c88dd14b124b19138b54408938a45ea6e60db65073469f45ae6ac8
export FONT_NOTO_TARBALL := noto-fonts-20170306.tar.gz
+export FONT_CULMUS_SHA256SUM :=
dcf112cfcccb76328dcfc095f4d7c7f4d2f7e48d0eed5e78b100d1d77ce2ed1b
+export FONT_CULMUS_TARBALL := culmus-0.131.tar.gz
+export FONT_LIBRE_HEBREW_SHA256SUM :=
f596257c1db706ce35795b18d7f66a4db99d427725f20e9384914b534142579a
+export FONT_LIBRE_HEBREW_TARBALL := libre-hebrew-1.0.tar.gz
+export FONT_ALEF_SHA256SUM :=
b98b67602a2c8880a1770f0b9e37c190f29a7e2ade5616784f0b89fbdb75bf52
+export FONT_ALEF_TARBALL := alef-1.001.tar.gz
export FREEHAND_SHA256SUM :=
0e422d1564a6dbf22a9af598535425271e583514c0f7ba7d9091676420de34ac
export FREEHAND_TARBALL := libfreehand-0.1.2.tar.xz
export FREETYPE_SHA256SUM :=
e5435f02e02d2b87bb8e4efdcaa14b1f78c9cf3ab1ed80f94b6382fb6acc7d78
diff --git a/external/more_fonts/ExternalPackage_alef.mk
b/external/more_fonts/ExternalPackage_alef.mk
new file mode 100644
index ..f41aca483ef3
--- /dev/null
+++ b/external/more_fonts/ExternalPackage_alef.mk
@@ -0,0 +1,17 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Cod
[Libreoffice-commits] core.git: sw/uiconfig
sw/uiconfig/swriter/menubar/menubar.xml |8 1 file changed, 4 insertions(+), 4 deletions(-) New commits: commit ac5518b6d4a14b2ed8011c35f97435e797a7b8d6 Author: Yousuf Philips <philip...@hotmail.com> Date: Tue Dec 19 03:46:15 2017 +0400 tdf#91781 Round of improvements to Writer's menus for 6.0 (2) Change-Id: Ic6baa344985963a48ba2a76c18cbf3001cbb4d11 Reviewed-on: https://gerrit.libreoffice.org/46756 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Yousuf Philips <philip...@hotmail.com> diff --git a/sw/uiconfig/swriter/menubar/menubar.xml b/sw/uiconfig/swriter/menubar/menubar.xml index 4a788b6b1307..df2a37ae796b 100644 --- a/sw/uiconfig/swriter/menubar/menubar.xml +++ b/sw/uiconfig/swriter/menubar/menubar.xml @@ -275,7 +275,9 @@ - + + + @@ -287,6 +289,7 @@ + @@ -330,11 +333,8 @@ - - - ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - officecfg/registry
officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu | 25 +- 1 file changed, 14 insertions(+), 11 deletions(-) New commits: commit 9980a70af4fc2a5954f7ce2239c592304d3ebac4 Author: Yousuf Philips <philip...@hotmail.com> Date: Thu Dec 14 00:04:58 2017 +0400 tdf#113590 Unify labels between both special character controls Change-Id: I40a3d53b6d7052d4c09b4906022d5d142e1dd298 Reviewed-on: https://gerrit.libreoffice.org/46422 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Yousuf Philips <philip...@hotmail.com> (cherry picked from commit de344874203caf5a528ff3e74508451de4341142) Reviewed-on: https://gerrit.libreoffice.org/46737 Reviewed-by: Heiko Tietze <tietze.he...@googlemail.com> Tested-by: Heiko Tietze <tietze.he...@googlemail.com> diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu index 18954711014e..d9ba29817bb5 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu @@ -3993,17 +3993,6 @@ true - - - Charmap - - - Insert Special Characters - - - 1 - - Rotation Pivot Point X @@ -4786,6 +4775,20 @@ 1 + + + Symbol + + + S~pecial Character... + + + Insert Special Characters + + + 1 + + ~Data Sources ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: officecfg/registry
officecfg/registry/data/org/openoffice/VCL.xcu | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) New commits: commit a2158c6ca2ba831665019827889f01e98dc93394 Author: Yousuf Philips <philip...@hotmail.com> Date: Sat Dec 16 17:35:03 2017 +0400 tdf#113538 New font order for hebrew fonts Change-Id: I6e820886204a53de3b29f30b42bb6503cfcc8e35 Reviewed-on: https://gerrit.libreoffice.org/45065 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Yousuf Philips <philip...@hotmail.com> diff --git a/officecfg/registry/data/org/openoffice/VCL.xcu b/officecfg/registry/data/org/openoffice/VCL.xcu index e47e4134a449..d759ef68509f 100644 --- a/officecfg/registry/data/org/openoffice/VCL.xcu +++ b/officecfg/registry/data/org/openoffice/VCL.xcu @@ -177,19 +177,19 @@ Tahoma;Arial Unicode MS;Lucida Sans Unicode;DejaVu Sans;Albany AMT;Albany;Arial;Nimbus Sans L;Interface User;Geneva;Tahoma;Dialog;Lucida;Helvetica;Helmet;Interface System;Sans Serif -Nachlieli CLM;Miriam CLM;Ellinia CLM;Aharoni CLM;Drugulin CLM;Miriam Mono CLM;Lucida Sans Unicode;Arial Unicode MS +Nachlieli CLM;Alef;Noto Sans Hebrew;Liberation Sans;Arial;Arial Hebrew;Lucida Sans Unicode;Lucida Grande;Arial Unicode MS -Nachlieli CLM;Miriam CLM;Ellinia CLM;Aharoni CLM;Drugulin CLM;Miriam Mono CLM;Lucida Sans Unicode;Arial Unicode MS +Nachlieli CLM;Alef;Noto Sans Hebrew;Liberation Sans;Arial;Arial Hebrew;Lucida Sans Unicode;Lucida Grande;Arial Unicode MS -Nachlieli CLM;Miriam CLM;Ellinia CLM;Aharoni CLM;Drugulin CLM;Miriam Mono CLM;Lucida Sans Unicode;Arial Unicode MS +Nachlieli CLM;Alef;Noto Sans Hebrew;Liberation Sans;Arial;Arial Hebrew;Lucida Sans Unicode;Lucida Grande;Arial Unicode MS -Nachlieli CLM;Miriam CLM;Ellinia CLM;Aharoni CLM;Drugulin CLM;Miriam Mono CLM;Lucida Sans Unicode;Arial Unicode MS +Nachlieli CLM;Alef;Noto Sans Hebrew;Liberation Sans;Arial;Arial Hebrew;Lucida Sans Unicode;Lucida Grande;Arial Unicode MS -Nachlieli CLM;Miriam CLM;Ellinia CLM;Aharoni CLM;Drugulin CLM;Miriam Mono CLM;Lucida Sans Unicode;Arial Unicode MS +David Libre;David CLM;Frank Ruehl CLM;Liberation Serif;David;Raanana;Lucida Sans Unicode;Lucida Grande;Arial Unicode MS ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - sc/uiconfig sd/uiconfig sw/uiconfig
sc/uiconfig/scalc/toolbar/formcontrols.xml| 21 ++
sc/uiconfig/scalc/toolbar/moreformcontrols.xml| 17 +-
sd/uiconfig/sdraw/toolbar/formcontrols.xml| 24 +
sd/uiconfig/sdraw/toolbar/moreformcontrols.xml| 22 ++-
sd/uiconfig/simpress/toolbar/formcontrols.xml | 24 +
sd/uiconfig/simpress/toolbar/moreformcontrols.xml | 22 ++-
sw/uiconfig/sglobal/toolbar/formcontrols.xml | 22 ---
sw/uiconfig/sglobal/toolbar/moreformcontrols.xml | 22 ++-
sw/uiconfig/swform/toolbar/formcontrols.xml | 22 ---
sw/uiconfig/swform/toolbar/moreformcontrols.xml | 22 ++-
sw/uiconfig/swreport/toolbar/formcontrols.xml | 22 ---
sw/uiconfig/swreport/toolbar/moreformcontrols.xml | 22 ++-
sw/uiconfig/swriter/toolbar/formcontrols.xml | 22 ---
sw/uiconfig/swriter/toolbar/moreformcontrols.xml | 22 ++-
sw/uiconfig/swxform/toolbar/formcontrols.xml | 25 ++
sw/uiconfig/swxform/toolbar/moreformcontrols.xml | 17 --
16 files changed, 173 insertions(+), 175 deletions(-)
New commits:
commit e027dc4629db2959e2c62b97b463c1846849dbd7
Author: Yousuf Philips <philip...@hotmail.com>
Date: Thu Dec 7 02:34:43 2017 +0400
tdf#81475 Organize the form toolbars
Change-Id: Ic79b326c4c15f656ce533eb37bbd27853b8f4af7
Reviewed-on: https://gerrit.libreoffice.org/43861
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Yousuf Philips <philip...@hotmail.com>
(cherry picked from commit f894386a8fe58639c295048fe7894f68613a0df1)
Reviewed-on: https://gerrit.libreoffice.org/46465
Tested-by: Yousuf Philips <philip...@hotmail.com>
diff --git a/sc/uiconfig/scalc/toolbar/formcontrols.xml
b/sc/uiconfig/scalc/toolbar/formcontrols.xml
index 3a5cbb2b889b..70b962a73894 100644
--- a/sc/uiconfig/scalc/toolbar/formcontrols.xml
+++ b/sc/uiconfig/scalc/toolbar/formcontrols.xml
@@ -21,26 +21,29 @@
-
-
+
+
-
+
-
-
-
+
-
+
-
+
+
+
+
+
+
-
+
diff --git a/sc/uiconfig/scalc/toolbar/moreformcontrols.xml
b/sc/uiconfig/scalc/toolbar/moreformcontrols.xml
index 796529fd550d..70bd84f6db41 100644
--- a/sc/uiconfig/scalc/toolbar/moreformcontrols.xml
+++ b/sc/uiconfig/scalc/toolbar/moreformcontrols.xml
@@ -18,20 +18,15 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
http://openoffice.org/2001/toolbar;
xmlns:xlink="http://www.w3.org/1999/xlink; toolbar:id="toolbar">
-
-
-
-
-
-
+
-
-
-
-
+
-
\ No newline at end of file
+
+
+
+
diff --git a/sd/uiconfig/sdraw/toolbar/formcontrols.xml
b/sd/uiconfig/sdraw/toolbar/formcontrols.xml
index 3905ded90a70..f40d374ec59a 100644
--- a/sd/uiconfig/sdraw/toolbar/formcontrols.xml
+++ b/sd/uiconfig/sdraw/toolbar/formcontrols.xml
@@ -21,23 +21,29 @@
-
-
+
+
-
+
-
-
-
+
-
+
-
-
+
+
+
+
+
+
+
+
+
+
diff --git a/sd/uiconfig/sdraw/toolbar/moreformcontrols.xml
b/sd/uiconfig/sdraw/toolbar/moreformcontrols.xml
index 1b1bbcef1b61..14f2d133dc05 100644
--- a/sd/uiconfig/sdraw/toolbar/moreformcontrols.xml
+++ b/sd/uiconfig/sdraw/toolbar/moreformcontrols.xml
@@ -18,23 +18,15 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
http://openoffice.org/2001/toolbar;
xmlns:xlink="http://www.w3.org/1999/xlink; toolbar:id="toolbar">
-
-
-
-
-
-
-
-
-
-
+
-
+
-
-
+
+
-
-
\ No newline at end of file
+
+
+
diff --git a/sd/uiconfig/simpress/toolbar/formcontrols.xml
b/sd/uiconfig/simpress/toolbar/formcontrols.xml
index 3905ded90a70..f40d374ec59a 100644
--- a/sd/uiconfig/simpress/toolbar/formcontrols.xml
+++ b/sd/uiconfig/simpress/toolbar/formcontrols.xml
@@ -21,23 +21,29 @@
-
-
+
+
-
+
-
-
-
+
-
+
-
-
+
+
+
+
+
+
+
+
+
+
diff --git a/sd/uiconfig/simpress/toolbar/moreformcontrols.xml
b/sd/uiconfig/simpress/toolbar/moreformcontrols.xml
index 1b1bbcef1b61..14f2d133dc05 100644
--- a/sd/uiconfig/simpress/toolbar/moreformcontrols.xml
+++ b/sd/uiconfig/simpress/toolbar/moreformcontrols.xml
@@ -18,23 +18,15 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
http://openoffice.org/2001/toolbar;
xmlns:xlink="http://www.w3.org/1999/xlink; toolbar:id="toolbar">
-
-
-
-
-
-
-
-
-
-
+
-
+
-
-
+
+
-
-
\ No newline at end of file
+
+
+
diff --git a/sw/uiconfig/sglobal/toolbar/formcontrols.xml
b/sw/uiconfig/sglobal/toolbar/formcontrols.xml
index 17eaa87e0f27..f40d374ec59a 100644
--- a/sw/uiconfig/sglobal/toolb
[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - icon-themes/breeze icon-themes/sifr icon-themes/tango officecfg/registry sw/uiconfig
icon-themes/breeze/links.txt |2
icon-themes/sifr/links.txt |4
icon-themes/tango/links.txt |3
officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu | 20 ++
officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu | 67
+-
sw/uiconfig/swriter/menubar/menubar.xml | 25 ++-
6 files changed, 107 insertions(+), 14 deletions(-)
New commits:
commit 35589bc4e390282f1e26b9900addc3742e61b3ff
Author: Yousuf Philips <philip...@hotmail.com>
Date: Fri Dec 15 01:54:52 2017 +0400
tdf#91781 Round of improvements to Writer's menus for 6.0
Change-Id: I17c1edc2e14146144868df51a1f5a71e323eead6
Reviewed-on: https://gerrit.libreoffice.org/46451
Reviewed-by: Yousuf Philips <philip...@hotmail.com>
Tested-by: Yousuf Philips <philip...@hotmail.com>
(cherry picked from commit 67d245adca298134fc8ab4364acbe880b4e0911a)
Reviewed-on: https://gerrit.libreoffice.org/46616
Tested-by: Jenkins <c...@libreoffice.org>
diff --git a/icon-themes/breeze/links.txt b/icon-themes/breeze/links.txt
index 314c6f4fd05b..a12de86cda03 100644
--- a/icon-themes/breeze/links.txt
+++ b/icon-themes/breeze/links.txt
@@ -708,6 +708,8 @@ cmd/sc_presentation.png cmd/sc_dia.png
# Style
cmd/lc_editstyled.png cmd/lc_editstyle.png
cmd/sc_editstyled.png cmd/sc_editstyle.png
+cmd/lc_viewsidebarstyles.png cmd/lc_designerdialog.png
+cmd/sc_viewsidebarstyles.png cmd/sc_designerdialog.png
# Outline
cmd/lc_outlineright.png cmd/lc_decrementlevel.png
diff --git a/icon-themes/sifr/links.txt b/icon-themes/sifr/links.txt
index 08af510ca16f..e2dae945a9ca 100644
--- a/icon-themes/sifr/links.txt
+++ b/icon-themes/sifr/links.txt
@@ -218,3 +218,7 @@ cmd/lc_bulletliststyle.png cmd/lc_defaultbullet.png
cmd/sc_bulletliststyle.png cmd/sc_defaultbullet.png
cmd/lc_numberliststyle.png cmd/lc_defaultnumbering.png
cmd/sc_numberliststyle.png cmd/sc_defaultnumbering.png
+
+# view menu
+cmd/lc_viewsidebarstyles.png cmd/lc_designerdialog.png
+cmd/sc_viewsidebarstyles.png cmd/sc_designerdialog.png
diff --git a/icon-themes/tango/links.txt b/icon-themes/tango/links.txt
index e73922a59a92..b483e5fa819d 100644
--- a/icon-themes/tango/links.txt
+++ b/icon-themes/tango/links.txt
@@ -624,3 +624,6 @@ cmd/sc_formatframemenu.png cmd/sc_inserttextframe.png
cmd/lc_charmapcontrol.png cmd/lc_insertsymbol.png
cmd/sc_charmapcontrol.png cmd/sc_insertsymbol.png
+# view menu
+cmd/lc_viewsidebarstyles.png cmd/lc_designerdialog.png
+cmd/sc_viewsidebarstyles.png cmd/sc_designerdialog.png
diff --git
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 9ae90f080953..18954711014e 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -2643,7 +2643,7 @@
- Doc~ument...
+ Text from File...
1
@@ -2779,6 +2779,17 @@
1
+
+
+ Styles
+
+
+ .uno:DesignerDialog
+
+
+ 1
+
+
Demote
@@ -4806,6 +4817,11 @@
Send via ~Bluetooth...
+
+
+ ~Export As
+
+
PDF
@@ -4839,7 +4855,7 @@
EPUB
- ~Export as EPUB...
+ Export as E~PUB...
Export as EPUB
diff --git
a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index 67877a3b5539..c0071633ec82 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -55,7 +55,7 @@
- ~Hidden Paragraphs
+ Field ~Hidden Paragraphs
8
@@ -1330,7 +1330,7 @@
- Lin~ks...
+ Lin~ks to External Files...
@@ -3140,17 +3140,55 @@
11
+
+
+ Alphabet Uppercase List
+
+
+
+
+ Alphabet Uppercase List
+
+
+ Alphabet Uppercase List Style
+
+
+ .uno:StyleApply?Style:string=Numbering
ABCFamilyName:string=NumberingStyles
+
+
+ 11
+
+
+
+
+ Alphabet Lowercase List
+
+
+
+
+ Alphabet Lowercase List
+
+
+ Alphabet Lowercase List Style
+
+
+ .uno:StyleAppl
[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - officecfg/registry sd/uiconfig
officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu |
9 -
sd/uiconfig/simpress/menubar/menubar.xml |
68 +-
2 files changed, 41 insertions(+), 36 deletions(-)
New commits:
commit 7386847ba4ab9521a658068c5940a72b77352c8b
Author: Yousuf Philips <philip...@hotmail.com>
Date: Sun Dec 17 04:56:34 2017 +0400
tdf#91857 Round of improvements to Impress's menus for 6.0
Change-Id: I844b8396a55820da904d4813cbb84c56c33af51c
Reviewed-on: https://gerrit.libreoffice.org/46583
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Yousuf Philips <philip...@hotmail.com>
(cherry picked from commit 7c6117780a8feb0b4ffcbaeaf649f4f6bc8470ec)
Reviewed-on: https://gerrit.libreoffice.org/46714
Tested-by: Yousuf Philips <philip...@hotmail.com>
diff --git
a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
index c91b33b9fe9e..6340812888e4 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
@@ -24,11 +24,6 @@
S~lide
-
-
- Navigate
-
-
Move
@@ -670,7 +665,7 @@
- Lin~ks...
+ Lin~ks to External Files...
@@ -741,7 +736,7 @@
- Import Slides...
+ Insert Slide from File...
.uno:ImportFromFile
diff --git a/sd/uiconfig/simpress/menubar/menubar.xml
b/sd/uiconfig/simpress/menubar/menubar.xml
index c146eb1ac5ca..d1e1c34a484e 100644
--- a/sd/uiconfig/simpress/menubar/menubar.xml
+++ b/sd/uiconfig/simpress/menubar/menubar.xml
@@ -62,13 +62,13 @@
-
+
@@ -81,6 +81,7 @@
+
@@ -98,7 +99,6 @@
-
@@ -150,7 +150,7 @@
-
+
@@ -217,7 +217,6 @@
-
@@ -225,6 +224,7 @@
+
@@ -260,6 +260,7 @@
+
@@ -269,10 +270,6 @@
-
-
-
-
@@ -280,11 +277,13 @@
-
+
+
+
+
-
@@ -413,12 +412,6 @@
-
-
-
-
-
-
@@ -488,6 +481,9 @@
+
+
+
@@ -522,22 +518,10 @@
+
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -546,6 +530,15 @@
+
+
+
+
+
+
+
+
+
@@ -584,6 +577,23 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
___
Libreoffice-commits mailing list
libreoffice-comm.
[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - officecfg/registry sc/uiconfig
officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu|7 -
officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |5
sc/uiconfig/scalc/menubar/menubar.xml| 51
++
3 files changed, 41 insertions(+), 22 deletions(-)
New commits:
commit 04b50d4b6fd944313fd5164598f64ef787645692
Author: Yousuf Philips <philip...@hotmail.com>
Date: Sun Dec 17 04:13:22 2017 +0400
tdf#91820 Round of improvements to Calc's menus for 6.0
Change-Id: Ia738456e5b351cc92777cd9795a3bfc641c454bc
Reviewed-on: https://gerrit.libreoffice.org/46582
Reviewed-by: Yousuf Philips <philip...@hotmail.com>
Tested-by: Yousuf Philips <philip...@hotmail.com>
(cherry picked from commit 41e71a7c6f10eeca0d7bc083fc68dc85d9f2a986)
Reviewed-on: https://gerrit.libreoffice.org/46713
Tested-by: Jenkins <c...@libreoffice.org>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
index d4fd477c22e6..8df4a8049d3d 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
@@ -1430,7 +1430,7 @@
- ~Hide Sheets
+ ~Hide Sheet
1
@@ -1918,10 +1918,7 @@
- Edit Lin~ks...
-
-
- Lin~ks...
+ Lin~ks to External Files...
diff --git
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 791ebefce51b..9ae90f080953 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -6438,6 +6438,11 @@
~Restart in Safe Mode...
+
+
+ Navigate
+
+
diff --git a/sc/uiconfig/scalc/menubar/menubar.xml
b/sc/uiconfig/scalc/menubar/menubar.xml
index 0a4136d3c242..9144b9b37e73 100644
--- a/sc/uiconfig/scalc/menubar/menubar.xml
+++ b/sc/uiconfig/scalc/menubar/menubar.xml
@@ -97,6 +97,7 @@
+
@@ -132,7 +133,6 @@
-
@@ -171,7 +171,7 @@
-
+
@@ -240,7 +240,6 @@
-
@@ -249,6 +248,7 @@
+
@@ -278,6 +278,7 @@
+
@@ -287,9 +288,6 @@
-
-
-
@@ -298,10 +296,15 @@
-
+
+
+
+
+
+
@@ -447,12 +450,6 @@
-
-
-
-
-
-
@@ -582,14 +579,17 @@
-
-
-
-
+
+
+
+
+
+
+
@@ -714,6 +714,23 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: download.lst external/more_fonts
download.lst|4 ++-- external/more_fonts/ExternalPackage_noto.mk | 18 ++ 2 files changed, 20 insertions(+), 2 deletions(-) New commits: commit e45e2c4897933f14c90a65fa74d0ad2a0b620ede Author: Yousuf Philips <philip...@hotmail.com> Date: Sat Dec 16 16:18:18 2017 +0400 tdf#103080 October 2017 update to Noto fonts In addition to updates to the already bundled fonts, Condensed and Light weights of English Noto Sans and Noto Serif have been added, as well as the addition of the Noto Sans Arabic Change-Id: I72bd7815d678fb4723692eb90d352d012ffe035e Reviewed-on: https://gerrit.libreoffice.org/46596 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Yousuf Philips <philip...@hotmail.com> diff --git a/download.lst b/download.lst index 358fbdad747c..21c99fe3082b 100644 --- a/download.lst +++ b/download.lst @@ -68,8 +68,8 @@ export FONT_SOURCESANS_SHA256SUM := e7bc9a1fec787a529e49f5a26b93dcdcf41506449dfc export FONT_SOURCESANS_TARBALL := edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz export FONT_EMOJIONE_COLOR_SHA256SUM := d1a08f7c10589f22740231017694af0a7a270760c8dec33d8d1c038e2be0a0c7 export FONT_EMOJIONE_COLOR_TARBALL := EmojiOneColor-SVGinOT-1.3.tar.gz -export FONT_NOTO_SHA256SUM := 8a269926a3c88dd14b124b19138b54408938a45ea6e60db65073469f45ae6ac8 -export FONT_NOTO_TARBALL := noto-fonts-20170306.tar.gz +export FONT_NOTO_SHA256SUM := 29acc15a4c4d6b51201ba5d60f303dfbc2e5acbfdb70413c9ae1ed34fa259994 +export FONT_NOTO_TARBALL := noto-fonts-20171024.tar.gz export FONT_CULMUS_SHA256SUM := dcf112cfcccb76328dcfc095f4d7c7f4d2f7e48d0eed5e78b100d1d77ce2ed1b export FONT_CULMUS_TARBALL := culmus-0.131.tar.gz export FONT_LIBRE_HEBREW_SHA256SUM := f596257c1db706ce35795b18d7f66a4db99d427725f20e9384914b534142579a diff --git a/external/more_fonts/ExternalPackage_noto.mk b/external/more_fonts/ExternalPackage_noto.mk index adbb88fd4f6d..dd52ac956265 100644 --- a/external/more_fonts/ExternalPackage_noto.mk +++ b/external/more_fonts/ExternalPackage_noto.mk @@ -15,10 +15,20 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_noto,$(LIBO_SHARE_FOLD NotoMono-Regular.ttf \ NotoNaskhArabic-Bold.ttf \ NotoNaskhArabic-Regular.ttf \ + NotoNaskhArabicUI-Bold.ttf \ + NotoNaskhArabicUI-Regular.ttf \ + NotoSansArabic-Bold.ttf \ + NotoSansArabic-Regular.ttf \ + NotoSansArabicUI-Bold.ttf \ + NotoSansArabicUI-Regular.ttf \ NotoSansArmenian-Bold.ttf \ NotoSansArmenian-Regular.ttf \ NotoSans-Bold.ttf \ NotoSans-BoldItalic.ttf \ + NotoSans-Condensed.ttf \ + NotoSans-CondensedBold.ttf \ + NotoSans-CondensedBoldItalic.ttf \ + NotoSans-CondensedItalic.ttf \ NotoSansGeorgian-Bold.ttf \ NotoSansGeorgian-Regular.ttf \ NotoSansHebrew-Bold.ttf \ @@ -26,12 +36,18 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_noto,$(LIBO_SHARE_FOLD NotoSans-Italic.ttf \ NotoSansLao-Bold.ttf \ NotoSansLao-Regular.ttf \ + NotoSans-Light.ttf \ + NotoSans-LightItalic.ttf \ NotoSansLisu-Regular.ttf \ NotoSans-Regular.ttf \ NotoSerifArmenian-Bold.ttf \ NotoSerifArmenian-Regular.ttf \ NotoSerif-Bold.ttf \ NotoSerif-BoldItalic.ttf \ + NotoSerif-Condensed.ttf \ + NotoSerif-CondensedBold.ttf \ + NotoSerif-CondensedBoldItalic.ttf \ + NotoSerif-CondensedItalic.ttf \ NotoSerifGeorgian-Bold.ttf \ NotoSerifGeorgian-Regular.ttf \ NotoSerifHebrew-Bold.ttf \ @@ -39,6 +55,8 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_noto,$(LIBO_SHARE_FOLD NotoSerif-Italic.ttf \ NotoSerifLao-Bold.ttf \ NotoSerifLao-Regular.ttf \ + NotoSerif-Light.ttf \ + NotoSerif-LightItalic.ttf \ NotoSerif-Regular.ttf \ )) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - download.lst external/more_fonts Makefile.fetch Repository.mk
Makefile.fetch |2 -- Repository.mk |2 -- download.lst|4 external/more_fonts/ExternalPackage_opensans.mk | 19 --- external/more_fonts/ExternalPackage_ptserif.mk | 19 --- external/more_fonts/Module_more_fonts.mk|4 external/more_fonts/UnpackedTarball_opensans.mk | 14 -- external/more_fonts/UnpackedTarball_ptserif.mk | 14 -- 8 files changed, 78 deletions(-) New commits: commit 6030c822c968be79b493de70c68a0bd51760e52f Author: Yousuf Philips <philip...@hotmail.com> Date: Wed Dec 6 16:15:35 2017 +0400 tdf#103080 Dont package Open Sans and PT_Serif fonts Change-Id: Iac1d572f19372465e9cc369454480d9b621bcd66 Reviewed-on: https://gerrit.libreoffice.org/45169 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Yousuf Philips <philip...@hotmail.com> (cherry picked from commit 0ce173b50fd12342979cf3f8f9b2d92267552060) Reviewed-on: https://gerrit.libreoffice.org/46617 diff --git a/Makefile.fetch b/Makefile.fetch index 3944ac75c7b2..e3095eee699f 100644 --- a/Makefile.fetch +++ b/Makefile.fetch @@ -173,8 +173,6 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk $(SRCDIR)/download.lst $(S $(call fetch_Optional,MORE_FONTS,FONT_LIBERATION_NARROW_TARBALL) \ $(call fetch_Optional,MORE_FONTS,FONT_LIBERATION_TARBALL) \ $(call fetch_Optional,MORE_FONTS,FONT_LINLIBERTINEG_TARBALL) \ - $(call fetch_Optional,MORE_FONTS,FONT_OPENSANS_TARBALL) \ - $(call fetch_Optional,MORE_FONTS,FONT_PTSERIF_TARBALL) \ $(call fetch_Optional,MORE_FONTS,FONT_SOURCECODE_TARBALL) \ $(call fetch_Optional,MORE_FONTS,FONT_SOURCESANS_TARBALL) \ $(call fetch_Optional,MORE_FONTS,FONT_EMOJIONE_COLOR_TARBALL) \ diff --git a/Repository.mk b/Repository.mk index 70d842f95d17..4bc9a34d87dc 100644 --- a/Repository.mk +++ b/Repository.mk @@ -955,8 +955,6 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo_fonts,\ fonts_liberation_narrow \ fonts_libertineg \ fonts_noto \ - fonts_opensans \ - fonts_ptserif \ fonts_sourcecode \ fonts_sourcesans \ ) \ diff --git a/download.lst b/download.lst index 7f8ae9c6e9ec..89f458c015e1 100644 --- a/download.lst +++ b/download.lst @@ -62,10 +62,6 @@ export FONT_LIBERATION_SHA256SUM := 7890278a6cd17873c57d9cd785c2d230d9abdea837e9 export FONT_LIBERATION_TARBALL := 5c781723a0d9ed6188960defba8e91cf-liberation-fonts-ttf-2.00.1.tar.gz export FONT_LINLIBERTINEG_SHA256SUM := 54adcb2bc8cac0927a647fbd9362f45eff48130ce6e2379dc3867643019e08c5 export FONT_LINLIBERTINEG_TARBALL := e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip -export FONT_OPENSANS_SHA256SUM := cc80fd415e57ecec067339beadd0eef9eaa45e65d3c51a922ba5f9172779bfb8 -export FONT_OPENSANS_TARBALL := 7a15edea7d415ac5150ea403e27401fd-open-sans-font-ttf-1.10.tar.gz -export FONT_PTSERIF_SHA256SUM := 6757feb23f889a82df59679d02b8ee1f907df0a0ac1c49cdb48ed737b60e5dfa -export FONT_PTSERIF_TARBALL := c3c1a8ba7452950636e871d25020ce0d-pt-serif-font-1.W.tar.gz export FONT_SOURCECODE_SHA256SUM := 09466dce8765f189acd8358c60c6736dcd95f042dee0b644bdcf65b6ae2f export FONT_SOURCECODE_TARBALL := 907d6e99f241876695c19ff3db0b8923-source-code-pro-2.030R-ro-1.050R-it.tar.gz export FONT_SOURCESANS_SHA256SUM := e7bc9a1fec787a529e49f5a26b93dcdcf41506449dfc70f92cdef6d17eb6fb61 diff --git a/external/more_fonts/ExternalPackage_opensans.mk b/external/more_fonts/ExternalPackage_opensans.mk deleted file mode 100644 index adbf9230304f.. --- a/external/more_fonts/ExternalPackage_opensans.mk +++ /dev/null @@ -1,19 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# 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/. -# - -$(eval $(call gb_ExternalPackage_ExternalPackage,fonts_opensans,font_opensans)) - -$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_opensans,$(LIBO_SHARE_FOLDER)/fonts/truetype,\ - OpenSans-BoldItalic.ttf \ - OpenSans-Bold.ttf \ - OpenSans-Italic.ttf \ - OpenSans-Regular.ttf \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/external/more_fonts/ExternalPackage_ptserif.mk b/external/more_fonts/ExternalPackage_ptserif.mk deleted file mode 100644 index 41dedfc8e486.. --- a/external/more_fonts/ExternalPackage_ptserif.mk +++ /dev/null @@ -1,19 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -
[Libreoffice-commits] core.git: officecfg/registry
officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu | 25 +- 1 file changed, 14 insertions(+), 11 deletions(-) New commits: commit de344874203caf5a528ff3e74508451de4341142 Author: Yousuf Philips <philip...@hotmail.com> Date: Thu Dec 14 00:04:58 2017 +0400 tdf#113590 Unify labels between both special character controls Change-Id: I40a3d53b6d7052d4c09b4906022d5d142e1dd298 Reviewed-on: https://gerrit.libreoffice.org/46422 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Yousuf Philips <philip...@hotmail.com> diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu index c903fe8b9d21..57fadcf37f38 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu @@ -4009,17 +4009,6 @@ true - - - Charmap - - - Insert Special Characters - - - 1 - - Rotation Pivot Point X @@ -4802,6 +4791,20 @@ 1 + + + Symbol + + + S~pecial Character... + + + Insert Special Characters + + + 1 + + ~Data Sources ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - sw/uiconfig
sw/uiconfig/swriter/ui/textgridpage.ui |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 2b02335dd53975ccea164709e42c0605291e61ea Author: Yousuf Philips <philip...@hotmail.com> Date: Thu Dec 14 04:00:29 2017 +0400 Dont translate strings replaced with text in code These are two labels in the Page dialog's Text Grid tab Change-Id: I77da5fab08fbd70825f3bfc46e1b12d7948291e0 Reviewed-on: https://gerrit.libreoffice.org/46431 Reviewed-by: Gabor Kelemen <kelem...@ubuntu.com> Tested-by: Gabor Kelemen <kelem...@ubuntu.com> (cherry picked from commit d631d2aad44e2d2bc64fc01168b9a948f54b249f) Reviewed-on: https://gerrit.libreoffice.org/46452 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Katarina Behrens <katarina.behr...@cib.de> diff --git a/sw/uiconfig/swriter/ui/textgridpage.ui b/sw/uiconfig/swriter/ui/textgridpage.ui index 80a8dd783d46..45485b9b67c2 100644 --- a/sw/uiconfig/swriter/ui/textgridpage.ui +++ b/sw/uiconfig/swriter/ui/textgridpage.ui @@ -220,7 +220,7 @@ True False start -(1-45) +(1-45) True @@ -262,7 +262,7 @@ False start 4 -(1-48) +(1-48) 2 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: officecfg/registry sd/uiconfig
officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu | 9 - sd/uiconfig/simpress/menubar/menubar.xml | 68 +- 2 files changed, 41 insertions(+), 36 deletions(-) New commits: commit 7c6117780a8feb0b4ffcbaeaf649f4f6bc8470ec Author: Yousuf Philips <philip...@hotmail.com> Date: Sun Dec 17 04:56:34 2017 +0400 tdf#91857 Round of improvements to Impress's menus for 6.0 Change-Id: I844b8396a55820da904d4813cbb84c56c33af51c Reviewed-on: https://gerrit.libreoffice.org/46583 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Yousuf Philips <philip...@hotmail.com> diff --git a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu index 3681daddb079..41ccadb46db6 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu @@ -24,11 +24,6 @@ S~lide - - - Navigate - - Move @@ -670,7 +665,7 @@ - Lin~ks... + Lin~ks to External Files... @@ -741,7 +736,7 @@ - Import Slides... + Insert Slide from File... .uno:ImportFromFile diff --git a/sd/uiconfig/simpress/menubar/menubar.xml b/sd/uiconfig/simpress/menubar/menubar.xml index c146eb1ac5ca..d1e1c34a484e 100644 --- a/sd/uiconfig/simpress/menubar/menubar.xml +++ b/sd/uiconfig/simpress/menubar/menubar.xml @@ -62,13 +62,13 @@ - + @@ -81,6 +81,7 @@ + @@ -98,7 +99,6 @@ - @@ -150,7 +150,7 @@ - + @@ -217,7 +217,6 @@ - @@ -225,6 +224,7 @@ + @@ -260,6 +260,7 @@ + @@ -269,10 +270,6 @@ - - - - @@ -280,11 +277,13 @@ - + + + + - @@ -413,12 +412,6 @@ - - - - - - @@ -488,6 +481,9 @@ + + + @@ -522,22 +518,10 @@ + - - - - - - - - - - - - - @@ -546,6 +530,15 @@ + + + + + + + + + @@ -584,6 +577,23 @@ + + + + + + + + + + + + + + + + + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: officecfg/registry sc/uiconfig
officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu|7 -
officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |5
sc/uiconfig/scalc/menubar/menubar.xml| 51
++
3 files changed, 41 insertions(+), 22 deletions(-)
New commits:
commit 41e71a7c6f10eeca0d7bc083fc68dc85d9f2a986
Author: Yousuf Philips <philip...@hotmail.com>
Date: Sun Dec 17 04:13:22 2017 +0400
tdf#91820 Round of improvements to Calc's menus for 6.0
Change-Id: Ia738456e5b351cc92777cd9795a3bfc641c454bc
Reviewed-on: https://gerrit.libreoffice.org/46582
Reviewed-by: Yousuf Philips <philip...@hotmail.com>
Tested-by: Yousuf Philips <philip...@hotmail.com>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
index cd1d1c9c7ee8..ff0052e97a4f 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
@@ -1422,7 +1422,7 @@
- ~Hide Sheets
+ ~Hide Sheet
1
@@ -1918,10 +1918,7 @@
- Edit Lin~ks...
-
-
- Lin~ks...
+ Lin~ks to External Files...
diff --git
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index bf4d5d8e0719..c5d9664e2aa3 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -6470,6 +6470,11 @@
~Restart in Safe Mode...
+
+
+ Navigate
+
+
diff --git a/sc/uiconfig/scalc/menubar/menubar.xml
b/sc/uiconfig/scalc/menubar/menubar.xml
index 98b754f5748b..b40e1bd484dc 100644
--- a/sc/uiconfig/scalc/menubar/menubar.xml
+++ b/sc/uiconfig/scalc/menubar/menubar.xml
@@ -97,6 +97,7 @@
+
@@ -132,7 +133,6 @@
-
@@ -171,7 +171,7 @@
-
+
@@ -240,7 +240,6 @@
-
@@ -249,6 +248,7 @@
+
@@ -278,6 +278,7 @@
+
@@ -287,9 +288,6 @@
-
-
-
@@ -298,10 +296,15 @@
-
+
+
+
+
+
+
@@ -449,12 +452,6 @@
-
-
-
-
-
-
@@ -584,14 +581,17 @@
-
-
-
-
+
+
+
+
+
+
+
@@ -716,6 +716,23 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: download.lst external/more_fonts Makefile.fetch Repository.mk
Makefile.fetch |3 +
Repository.mk |3 +
download.lst|6 +++
external/more_fonts/ExternalPackage_alef.mk | 17 ++
external/more_fonts/ExternalPackage_culmus.mk | 33
external/more_fonts/ExternalPackage_libre_hebrew.mk | 25 +++
external/more_fonts/Module_more_fonts.mk|6 +++
external/more_fonts/UnpackedTarball_alef.mk | 14
external/more_fonts/UnpackedTarball_culmus.mk | 14
external/more_fonts/UnpackedTarball_libre_hebrew.mk | 14
10 files changed, 135 insertions(+)
New commits:
commit 4099b7628405e0ad16844eb59a916aa56ffa76ad
Author: Yousuf Philips <philip...@hotmail.com>
Date: Sat Dec 16 16:55:46 2017 +0400
tdf#113538 Add Hebrew fonts into default installation
Includes these fonts
* Alef
* David CLM
* David Libre
* Frank Ruehl CLM
* Frank Ruhl Hofshi
* Miriam CLM
* Miriam Libre
* Miriam Mono CLM
* Nachlieli CLM
* Rubik
Change-Id: Ib16a30c1f5b8fae372b3f9fc3f6de8a3be55bc85
Reviewed-on: https://gerrit.libreoffice.org/45101
Reviewed-by: Yousuf Philips <philip...@hotmail.com>
Tested-by: Yousuf Philips <philip...@hotmail.com>
Tested-by: Jenkins <c...@libreoffice.org>
diff --git a/Makefile.fetch b/Makefile.fetch
index e3095eee699f..33558239eeb8 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -177,6 +177,9 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk
$(SRCDIR)/download.lst $(S
$(call fetch_Optional,MORE_FONTS,FONT_SOURCESANS_TARBALL) \
$(call fetch_Optional,MORE_FONTS,FONT_EMOJIONE_COLOR_TARBALL) \
$(call fetch_Optional,MORE_FONTS,FONT_NOTO_TARBALL) \
+ $(call fetch_Optional,MORE_FONTS,FONT_CULMUS_TARBALL) \
+ $(call fetch_Optional,MORE_FONTS,FONT_LIBRE_HEBREW_TARBALL) \
+ $(call fetch_Optional,MORE_FONTS,FONT_ALEF_TARBALL) \
$(call fetch_Optional,MSPUB,MSPUB_TARBALL) \
$(call fetch_Optional,MWAW,MWAW_TARBALL) \
$(call
fetch_Optional,MYSQL_CONNECTOR_CPP,MYSQL_CONNECTOR_CPP_TARBALL) \
diff --git a/Repository.mk b/Repository.mk
index 9d27eb4cf4ab..ef2b12a9bc0f 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -955,14 +955,17 @@ $(eval $(call
gb_Helper_register_packages_for_install,ooo_fonts,\
$(if $(USING_X11)$(ENABLE_HEADLESS)$(filter ANDROID,$(OS)), \
postprocess_fontconfig) \
$(call gb_Helper_optional,MORE_FONTS,\
+ fonts_alef \
fonts_caladea \
fonts_carlito \
+ fonts_culmus \
fonts_dejavu \
fonts_emojione_color \
fonts_gentium \
fonts_liberation \
fonts_liberation_narrow \
fonts_libertineg \
+ fonts_libre_hebrew \
fonts_noto \
fonts_sourcecode \
fonts_sourcesans \
diff --git a/download.lst b/download.lst
index e318dec4625c..358fbdad747c 100644
--- a/download.lst
+++ b/download.lst
@@ -70,6 +70,12 @@ export FONT_EMOJIONE_COLOR_SHA256SUM :=
d1a08f7c10589f22740231017694af0a7a270760
export FONT_EMOJIONE_COLOR_TARBALL := EmojiOneColor-SVGinOT-1.3.tar.gz
export FONT_NOTO_SHA256SUM :=
8a269926a3c88dd14b124b19138b54408938a45ea6e60db65073469f45ae6ac8
export FONT_NOTO_TARBALL := noto-fonts-20170306.tar.gz
+export FONT_CULMUS_SHA256SUM :=
dcf112cfcccb76328dcfc095f4d7c7f4d2f7e48d0eed5e78b100d1d77ce2ed1b
+export FONT_CULMUS_TARBALL := culmus-0.131.tar.gz
+export FONT_LIBRE_HEBREW_SHA256SUM :=
f596257c1db706ce35795b18d7f66a4db99d427725f20e9384914b534142579a
+export FONT_LIBRE_HEBREW_TARBALL := libre-hebrew-1.0.tar.gz
+export FONT_ALEF_SHA256SUM :=
b98b67602a2c8880a1770f0b9e37c190f29a7e2ade5616784f0b89fbdb75bf52
+export FONT_ALEF_TARBALL := alef-1.001.tar.gz
export FREEHAND_SHA256SUM :=
0e422d1564a6dbf22a9af598535425271e583514c0f7ba7d9091676420de34ac
export FREEHAND_TARBALL := libfreehand-0.1.2.tar.xz
export FREETYPE_SHA256SUM :=
e5435f02e02d2b87bb8e4efdcaa14b1f78c9cf3ab1ed80f94b6382fb6acc7d78
diff --git a/external/more_fonts/ExternalPackage_alef.mk
b/external/more_fonts/ExternalPackage_alef.mk
new file mode 100644
index ..f41aca483ef3
--- /dev/null
+++ b/external/more_fonts/ExternalPackage_alef.mk
@@ -0,0 +1,17 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# 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/.
+#
+
+$(eval $(call gb_ExternalPackage_ExternalPackage,fonts_alef,font_alef))
+
+$(eval $(call
gb_ExternalPa
[Libreoffice-commits] core.git: officecfg/registry
officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu| 8 officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu | 8 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu | 8 officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu | 8 4 files changed, 8 insertions(+), 24 deletions(-) New commits: commit b1f93cad88d92e443966a3970a73fcfd7267f7a6 Author: Yousuf Philips <philip...@hotmail.com> Date: Wed Dec 6 21:18:58 2017 +0400 tdf#114286 Move UnderlineDouble to GenericCommands Change-Id: Iaaffb70e0023317816b582e3d2ea32eded66cd71 Reviewed-on: https://gerrit.libreoffice.org/45974 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Yousuf Philips <philip...@hotmail.com> diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu index 065f4c3f9ac2..cd1d1c9c7ee8 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu @@ -1069,14 +1069,6 @@ 1 - - - Underline: Double - - - 1 - - ~Comment on Change... diff --git a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu index 4d25cc30a9f3..3681daddb079 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu @@ -1895,14 +1895,6 @@ 1 - - - Double Underline - - - 9 - - Comme~nt diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu index 2b0cf5aee382..bf4d5d8e0719 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu @@ -1570,6 +1570,14 @@ .uno:Underline + + + Double Underline + + + 9 + + Overline diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu index a1443cfc70ca..0cff97f27ebb 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu @@ -884,14 +884,6 @@ Page Style - - - Double Underline - - - 9 - - Apply and Edit ~Changes ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: download.lst external/more_fonts Makefile.fetch Repository.mk
Makefile.fetch |2 -- Repository.mk |2 -- download.lst|4 external/more_fonts/ExternalPackage_opensans.mk | 19 --- external/more_fonts/ExternalPackage_ptserif.mk | 19 --- external/more_fonts/Module_more_fonts.mk|4 external/more_fonts/UnpackedTarball_opensans.mk | 14 -- external/more_fonts/UnpackedTarball_ptserif.mk | 14 -- 8 files changed, 78 deletions(-) New commits: commit 0ce173b50fd12342979cf3f8f9b2d92267552060 Author: Yousuf Philips <philip...@hotmail.com> Date: Wed Dec 6 16:15:35 2017 +0400 tdf#103080 Dont package Open Sans and PT_Serif fonts Change-Id: Iac1d572f19372465e9cc369454480d9b621bcd66 Reviewed-on: https://gerrit.libreoffice.org/45169 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Yousuf Philips <philip...@hotmail.com> diff --git a/Makefile.fetch b/Makefile.fetch index 3944ac75c7b2..e3095eee699f 100644 --- a/Makefile.fetch +++ b/Makefile.fetch @@ -173,8 +173,6 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk $(SRCDIR)/download.lst $(S $(call fetch_Optional,MORE_FONTS,FONT_LIBERATION_NARROW_TARBALL) \ $(call fetch_Optional,MORE_FONTS,FONT_LIBERATION_TARBALL) \ $(call fetch_Optional,MORE_FONTS,FONT_LINLIBERTINEG_TARBALL) \ - $(call fetch_Optional,MORE_FONTS,FONT_OPENSANS_TARBALL) \ - $(call fetch_Optional,MORE_FONTS,FONT_PTSERIF_TARBALL) \ $(call fetch_Optional,MORE_FONTS,FONT_SOURCECODE_TARBALL) \ $(call fetch_Optional,MORE_FONTS,FONT_SOURCESANS_TARBALL) \ $(call fetch_Optional,MORE_FONTS,FONT_EMOJIONE_COLOR_TARBALL) \ diff --git a/Repository.mk b/Repository.mk index eb0365b0034a..9d27eb4cf4ab 100644 --- a/Repository.mk +++ b/Repository.mk @@ -964,8 +964,6 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo_fonts,\ fonts_liberation_narrow \ fonts_libertineg \ fonts_noto \ - fonts_opensans \ - fonts_ptserif \ fonts_sourcecode \ fonts_sourcesans \ ) \ diff --git a/download.lst b/download.lst index 120e5211eb8c..e318dec4625c 100644 --- a/download.lst +++ b/download.lst @@ -62,10 +62,6 @@ export FONT_LIBERATION_SHA256SUM := 7890278a6cd17873c57d9cd785c2d230d9abdea837e9 export FONT_LIBERATION_TARBALL := 5c781723a0d9ed6188960defba8e91cf-liberation-fonts-ttf-2.00.1.tar.gz export FONT_LINLIBERTINEG_SHA256SUM := 54adcb2bc8cac0927a647fbd9362f45eff48130ce6e2379dc3867643019e08c5 export FONT_LINLIBERTINEG_TARBALL := e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip -export FONT_OPENSANS_SHA256SUM := cc80fd415e57ecec067339beadd0eef9eaa45e65d3c51a922ba5f9172779bfb8 -export FONT_OPENSANS_TARBALL := 7a15edea7d415ac5150ea403e27401fd-open-sans-font-ttf-1.10.tar.gz -export FONT_PTSERIF_SHA256SUM := 6757feb23f889a82df59679d02b8ee1f907df0a0ac1c49cdb48ed737b60e5dfa -export FONT_PTSERIF_TARBALL := c3c1a8ba7452950636e871d25020ce0d-pt-serif-font-1.W.tar.gz export FONT_SOURCECODE_SHA256SUM := 09466dce8765f189acd8358c60c6736dcd95f042dee0b644bdcf65b6ae2f export FONT_SOURCECODE_TARBALL := 907d6e99f241876695c19ff3db0b8923-source-code-pro-2.030R-ro-1.050R-it.tar.gz export FONT_SOURCESANS_SHA256SUM := e7bc9a1fec787a529e49f5a26b93dcdcf41506449dfc70f92cdef6d17eb6fb61 diff --git a/external/more_fonts/ExternalPackage_opensans.mk b/external/more_fonts/ExternalPackage_opensans.mk deleted file mode 100644 index adbf9230304f.. --- a/external/more_fonts/ExternalPackage_opensans.mk +++ /dev/null @@ -1,19 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# 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/. -# - -$(eval $(call gb_ExternalPackage_ExternalPackage,fonts_opensans,font_opensans)) - -$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_opensans,$(LIBO_SHARE_FOLDER)/fonts/truetype,\ - OpenSans-BoldItalic.ttf \ - OpenSans-Bold.ttf \ - OpenSans-Italic.ttf \ - OpenSans-Regular.ttf \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/external/more_fonts/ExternalPackage_ptserif.mk b/external/more_fonts/ExternalPackage_ptserif.mk deleted file mode 100644 index 41dedfc8e486.. --- a/external/more_fonts/ExternalPackage_ptserif.mk +++ /dev/null @@ -1,19 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# 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
[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - officecfg/registry qadevOOo/tests sw/inc sw/qa sw/source sw/uiconfig
officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu |8
qadevOOo/tests/java/ifc/style/_ParagraphProperties.java |8
qadevOOo/tests/java/mod/_sw/SwXParagraph.java |2 +-
sw/inc/poolfmt.hxx | 10
+-
sw/inc/strings.hrc | 10
+-
sw/qa/python/check_styles.py|2 +-
sw/source/core/doc/SwStyleNameMapper.cxx| 10
+-
sw/source/ui/vba/vbastyles.cxx | 10
+-
sw/uiconfig/sglobal/menubar/menubar.xml |4 ++--
sw/uiconfig/swriter/menubar/menubar.xml |4 ++--
sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui|4 ++--
sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui |4 ++--
12 files changed, 38 insertions(+), 38 deletions(-)
New commits:
commit af44ee8991691b9a971901b3de36fa0e1253eac9
Author: Yousuf Philips <philip...@hotmail.com>
Date: Tue Dec 5 13:54:29 2017 +0400
tdf#106988 New names for the new numbering styles
Change-Id: Ibc93aaa552652d61ac49652cf0ac5fcb68b48a12
Reviewed-on: https://gerrit.libreoffice.org/37995
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Michael Stahl <mst...@redhat.com>
(cherry picked from commit 74c527abc0f3b5aa0fa179401ad05a79dc889973)
Reviewed-on: https://gerrit.libreoffice.org/46147
Reviewed-by: Yousuf Philips <philip...@hotmail.com>
diff --git
a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index fb87ee73b526..67877a3b5539 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -3121,7 +3121,7 @@
11
-
+
Number List
@@ -3134,13 +3134,13 @@
Number List Style
- .uno:StyleApply?Style:string=Numbering
1FamilyName:string=NumberingStyles
+ .uno:StyleApply?Style:string=Numbering
123FamilyName:string=NumberingStyles
11
-
+
Roman List
@@ -3153,7 +3153,7 @@
Roman List Style
- .uno:StyleApply?Style:string=Numbering
4FamilyName:string=NumberingStyles
+ .uno:StyleApply?Style:string=Numbering
IVXFamilyName:string=NumberingStyles
11
diff --git a/qadevOOo/tests/java/ifc/style/_ParagraphProperties.java
b/qadevOOo/tests/java/ifc/style/_ParagraphProperties.java
index 570e7b307ca6..d1f134b9f258 100644
--- a/qadevOOo/tests/java/ifc/style/_ParagraphProperties.java
+++ b/qadevOOo/tests/java/ifc/style/_ParagraphProperties.java
@@ -102,16 +102,16 @@ import com.sun.star.xml.AttributeData;
public class _ParagraphProperties extends MultiPropertyTest {
/**
* Custom tester for numbering style properties. Switches between
- * 'Numbering 1' and 'Numbering 2' styles.
+ * 'Numbering 123' and 'Numbering ABC' styles.
*/
protected PropertyTester NumberingStyleTester = new PropertyTester() {
@Override
protected Object getNewValue(String propName, Object oldValue)
throws java.lang.IllegalArgumentException {
-if ((oldValue != null) && (oldValue.equals("Numbering 1"))) {
-return "Numbering 2";
+if ((oldValue != null) && (oldValue.equals("Numbering 123"))) {
+return "Numbering ABC";
} else {
-return "Numbering 1";
+return "Numbering 123";
}
}
};
diff --git a/qadevOOo/tests/java/mod/_sw/SwXParagraph.java
b/qadevOOo/tests/java/mod/_sw/SwXParagraph.java
index 165e270454ef..c32d63b28527 100644
--- a/qadevOOo/tests/java/mod/_sw/SwXParagraph.java
+++ b/qadevOOo/tests/java/mod/_sw/SwXParagraph.java
@@ -196,7 +196,7 @@ public class SwXParagraph extends TestCase {
portP = UnoRuntime.queryInterface(XPropertySet.class, port);
paraP = UnoRuntime.queryInterface(XPropertySet.class, para);
-paraP.setPropertyValue("NumberingStyleName","Numbering 4");
+paraP.setPropertyValue("NumberingStyleName","Numbering IVX");
nRules = paraP.getPropertyValue("NumberingRules");
diff --git a/sw/inc/poolfmt.hxx b/sw/inc/poolfmt.hxx
index 2ef34a0a9fa5..025ea9fc0b89 100644
--- a/sw/inc/poolfmt.hxx
+++ b/sw/inc/poolfmt.hxx
@@ -187,11 +187,11 @@ RES_POOLPAGE_END
enum RES_POOL_NUMRULE_
[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - 3 commits - sd/inc sd/source sd/uiconfig sw/inc sw/uiconfig
sd/inc/strings.hrc|2 ++
sd/source/ui/sidebar/SlideBackground.cxx |6 +++---
sd/uiconfig/simpress/ui/sidebarslidebackground.ui |6 +++---
sw/inc/app.hrc| 10 +-
sw/uiconfig/swriter/menubar/menubar.xml | 14 +++---
5 files changed, 20 insertions(+), 18 deletions(-)
New commits:
commit 95efc0b875f3fd3152da051f27ded52e048151bf
Author: Yousuf Philips <philip...@hotmail.com>
Date: Wed Dec 6 18:01:03 2017 +0400
tdf#89466 Fix minor localization bugs
Change-Id: I1ee93f81dcd83b5a9277ea444ec8e10db7d790df
Reviewed-on: https://gerrit.libreoffice.org/45958
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Katarina Behrens <katarina.behr...@cib.de>
(cherry picked from commit c5505f5a22917c339af4e4c840a6a1ae20e2503f)
Reviewed-on: https://gerrit.libreoffice.org/46033
Reviewed-by: Yousuf Philips <philip...@hotmail.com>
diff --git a/sd/inc/strings.hrc b/sd/inc/strings.hrc
index 4850e5d63b2d..20dfdcb67229 100644
--- a/sd/inc/strings.hrc
+++ b/sd/inc/strings.hrc
@@ -284,7 +284,9 @@
#define STR_PAGE_NAME NC_("STR_PAGE_NAME",
"Page" )
#define STR_SLIDE_NAME NC_("STR_SLIDE_NAME",
"Slide" )
#define STR_MASTERSLIDE_NAME
NC_("STR_MASTERSLIDE_NAME", "Master Slide")
+#define STR_MASTERSLIDE_LABEL
NC_("STR_MASTERSLIDE_LABEL", "Master Slide:")
#define STR_MASTERPAGE_NAME
NC_("STR_MASTERPAGE_NAME", "Master Page")
+#define STR_MASTERPAGE_LABEL
NC_("STR_MASTERPAGE_LABEL", "Master Page:")
#define STR_NOTES NC_("STR_NOTES",
"(Notes)" )
#define STR_HANDOUT NC_("STR_HANDOUT",
"Handouts" )
#define STR_PRESOBJ_MPTITLE
NC_("STR_PRESOBJ_MPTITLE", "Click to edit the title text format" )
diff --git a/sd/source/ui/sidebar/SlideBackground.cxx
b/sd/source/ui/sidebar/SlideBackground.cxx
index 8b2e15dc7671..9c94a208b2cb 100644
--- a/sd/source/ui/sidebar/SlideBackground.cxx
+++ b/sd/source/ui/sidebar/SlideBackground.cxx
@@ -239,7 +239,7 @@ void SlideBackground::HandleContextChange(
if ( IsImpress() )
{
-mpMasterLabel->SetText(SdResId(STR_MASTERSLIDE_NAME));
+mpMasterLabel->SetText(SdResId(STR_MASTERSLIDE_LABEL));
mpMarginSelectBox->Hide();
if ( maContext == maImpressMasterContext )
@@ -294,7 +294,7 @@ void SlideBackground::HandleContextChange(
}
else if ( IsDraw() )
{
-mpMasterLabel->SetText(SdResId(STR_MASTERPAGE_NAME));
+mpMasterLabel->SetText(SdResId(STR_MASTERPAGE_LABEL));
}
}
@@ -558,7 +558,7 @@ IMPL_LINK(SlideBackground, EventMultiplexerListener,
}
else if ( maContext == maImpressNotesContext )
{
-mpMasterLabel->SetText(SdResId(STR_MASTERSLIDE_NAME));
+mpMasterLabel->SetText(SdResId(STR_MASTERSLIDE_LABEL));
ViewShell* pMainViewShell =
mrBase.GetMainViewShell().get();
if (pMainViewShell)
diff --git a/sd/uiconfig/simpress/ui/sidebarslidebackground.ui
b/sd/uiconfig/simpress/ui/sidebarslidebackground.ui
index 70bccb25c7c8..55783273dfe7 100644
--- a/sd/uiconfig/simpress/ui/sidebarslidebackground.ui
+++ b/sd/uiconfig/simpress/ui/sidebarslidebackground.ui
@@ -194,7 +194,7 @@
True
False
end
-Orientation:
+Orientation:
0
@@ -209,7 +209,7 @@
True
-Master Slide
+Master View
True
True
True
@@ -264,7 +264,7 @@
True
False
end
-Margin:
+Margin:
0
commit 4b56073faac30ea74c698ae7b526dc1b8ee36262
Author: Yousuf Philips <philip...@hotmail.com>
Date: Thu Dec 7 02:48:43 2017 +0400
tdf91781 Small reorganization and shrinking of the form menu
Change-Id: Icaad5b6769da227f7ec3b13c6d793e6464e2ffc9
Reviewed-on: https://gerrit.libreoffice.org/45999
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Yousuf Philips <philip...@hotmail.com>
(cherry picked from commit 58e6ef08271f51486e37edeaa287a6d54b2b9720)
Reviewed-on: https://gerrit.libreoffice.org/46031
diff --git a/sw/uiconfig/swriter/menubar/menubar.xml
b/sw/uiconfig/swriter/menub
[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - officecfg/registry sd/uiconfig
officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu | 32 ++ sd/uiconfig/simpress/menubar/menubar.xml | 8 +- 2 files changed, 36 insertions(+), 4 deletions(-) New commits: commit a4bba04f339d9714fa7ca22cfa76f09163c70e38 Author: Yousuf Philips <philip...@hotmail.com> Date: Sat Dec 2 22:18:10 2017 +0400 tdf#114207 create commands for slide number and slide fields Change-Id: I5b7cfaf602568d9254dfeafd6afe27b9b0895d37 Reviewed-on: https://gerrit.libreoffice.org/45722 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Yousuf Philips <philip...@hotmail.com> (cherry picked from commit 495ac1bc97f3deea8e13cb1a2b9f59d087873c3f) Reviewed-on: https://gerrit.libreoffice.org/45969 diff --git a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu index 9bc0208e54d6..c91b33b9fe9e 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu @@ -500,16 +500,40 @@ ~Page Number + + + ~Slide Number + + + .uno:InsertPageField + + Page Tit~le + + + Slide Tit~le + + + .uno:InsertPageTitleField + + Page ~Count + + + Slide ~Count + + + .uno:InsertPagesField + + F~ields... @@ -1629,6 +1653,14 @@ P~age Number... + + + S~lide Number... + + + .uno:InsertPageNumber + + Date and ~Time... diff --git a/sd/uiconfig/simpress/menubar/menubar.xml b/sd/uiconfig/simpress/menubar/menubar.xml index 0de1b9dadd42..c146eb1ac5ca 100644 --- a/sd/uiconfig/simpress/menubar/menubar.xml +++ b/sd/uiconfig/simpress/menubar/menubar.xml @@ -241,7 +241,7 @@ - + @@ -250,9 +250,9 @@ - - - + + + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: icon-themes/breeze icon-themes/sifr icon-themes/tango officecfg/registry sw/uiconfig
icon-themes/breeze/links.txt |2
icon-themes/sifr/links.txt |4
icon-themes/tango/links.txt |3
officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu | 20 ++
officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu | 67
+-
sw/uiconfig/swriter/menubar/menubar.xml | 27
++--
6 files changed, 108 insertions(+), 15 deletions(-)
New commits:
commit 67d245adca298134fc8ab4364acbe880b4e0911a
Author: Yousuf Philips <philip...@hotmail.com>
Date: Fri Dec 15 01:54:52 2017 +0400
tdf#91781 Round of improvements to Writer's menus for 6.0
Change-Id: I17c1edc2e14146144868df51a1f5a71e323eead6
Reviewed-on: https://gerrit.libreoffice.org/46451
Reviewed-by: Yousuf Philips <philip...@hotmail.com>
Tested-by: Yousuf Philips <philip...@hotmail.com>
diff --git a/icon-themes/breeze/links.txt b/icon-themes/breeze/links.txt
index 314c6f4fd05b..a12de86cda03 100644
--- a/icon-themes/breeze/links.txt
+++ b/icon-themes/breeze/links.txt
@@ -708,6 +708,8 @@ cmd/sc_presentation.png cmd/sc_dia.png
# Style
cmd/lc_editstyled.png cmd/lc_editstyle.png
cmd/sc_editstyled.png cmd/sc_editstyle.png
+cmd/lc_viewsidebarstyles.png cmd/lc_designerdialog.png
+cmd/sc_viewsidebarstyles.png cmd/sc_designerdialog.png
# Outline
cmd/lc_outlineright.png cmd/lc_decrementlevel.png
diff --git a/icon-themes/sifr/links.txt b/icon-themes/sifr/links.txt
index 08af510ca16f..e2dae945a9ca 100644
--- a/icon-themes/sifr/links.txt
+++ b/icon-themes/sifr/links.txt
@@ -218,3 +218,7 @@ cmd/lc_bulletliststyle.png cmd/lc_defaultbullet.png
cmd/sc_bulletliststyle.png cmd/sc_defaultbullet.png
cmd/lc_numberliststyle.png cmd/lc_defaultnumbering.png
cmd/sc_numberliststyle.png cmd/sc_defaultnumbering.png
+
+# view menu
+cmd/lc_viewsidebarstyles.png cmd/lc_designerdialog.png
+cmd/sc_viewsidebarstyles.png cmd/sc_designerdialog.png
diff --git a/icon-themes/tango/links.txt b/icon-themes/tango/links.txt
index e73922a59a92..b483e5fa819d 100644
--- a/icon-themes/tango/links.txt
+++ b/icon-themes/tango/links.txt
@@ -624,3 +624,6 @@ cmd/sc_formatframemenu.png cmd/sc_inserttextframe.png
cmd/lc_charmapcontrol.png cmd/lc_insertsymbol.png
cmd/sc_charmapcontrol.png cmd/sc_insertsymbol.png
+# view menu
+cmd/lc_viewsidebarstyles.png cmd/lc_designerdialog.png
+cmd/sc_viewsidebarstyles.png cmd/sc_designerdialog.png
diff --git
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 0c70d811a465..2b0cf5aee382 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -2643,7 +2643,7 @@
- Doc~ument...
+ Text from File...
1
@@ -2779,6 +2779,17 @@
1
+
+
+ Styles
+
+
+ .uno:DesignerDialog
+
+
+ 1
+
+
Demote
@@ -4806,6 +4817,11 @@
Send via ~Bluetooth...
+
+
+ ~Export As
+
+
PDF
@@ -4839,7 +4855,7 @@
EPUB
- ~Export as EPUB...
+ Export as E~PUB...
Export as EPUB
diff --git
a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index 23964bfe7fdb..a1443cfc70ca 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -55,7 +55,7 @@
- ~Hidden Paragraphs
+ Field ~Hidden Paragraphs
8
@@ -1346,7 +1346,7 @@
- Lin~ks...
+ Lin~ks to External Files...
@@ -3148,17 +3148,55 @@
11
+
+
+ Alphabet Uppercase List
+
+
+
+
+ Alphabet Uppercase List
+
+
+ Alphabet Uppercase List Style
+
+
+ .uno:StyleApply?Style:string=Numbering
ABCFamilyName:string=NumberingStyles
+
+
+ 11
+
+
+
+
+ Alphabet Lowercase List
+
+
+
+
+ Alphabet Lowercase List
+
+
+ Alphabet Lowercase List Style
+
+
+ .uno:StyleApply?Style:string=Numbering
abcFamilyName:string=NumberingStyles
+
+
+ 11
+
+
- Roman List
+ Ro
[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - sw/uiconfig
sw/uiconfig/sglobal/toolbar/frameobjectbar.xml | 14 +++--- sw/uiconfig/sglobal/toolbar/oleobjectbar.xml | 14 +++--- sw/uiconfig/swriter/toolbar/frameobjectbar.xml | 14 +++--- sw/uiconfig/swriter/toolbar/oleobjectbar.xml | 14 +++--- 4 files changed, 28 insertions(+), 28 deletions(-) New commits: commit 3cd7f15df1dbd4603f01fceed674486e4adc9c09 Author: Yousuf Philips <philip...@hotmail.com> Date: Tue Dec 5 12:52:44 2017 +0400 tdf#37697 Use object alignment buttons rather than text alignment Change-Id: Ia100a29aefaca81c5282f8077feb319f9d1809cb Reviewed-on: https://gerrit.libreoffice.org/45850 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Yousuf Philips <philip...@hotmail.com> (cherry picked from commit 24f50a40fc704b92a0aa6017f1877b4399926640) Reviewed-on: https://gerrit.libreoffice.org/45960 Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com> diff --git a/sw/uiconfig/sglobal/toolbar/frameobjectbar.xml b/sw/uiconfig/sglobal/toolbar/frameobjectbar.xml index 2c234283bcf1..5c293252eaa1 100644 --- a/sw/uiconfig/sglobal/toolbar/frameobjectbar.xml +++ b/sw/uiconfig/sglobal/toolbar/frameobjectbar.xml @@ -29,13 +29,13 @@ - - - - - - - + + + + + + + diff --git a/sw/uiconfig/sglobal/toolbar/oleobjectbar.xml b/sw/uiconfig/sglobal/toolbar/oleobjectbar.xml index 4acd385514bf..6cbf98575801 100644 --- a/sw/uiconfig/sglobal/toolbar/oleobjectbar.xml +++ b/sw/uiconfig/sglobal/toolbar/oleobjectbar.xml @@ -29,13 +29,13 @@ - - - - - - - + + + + + + + diff --git a/sw/uiconfig/swriter/toolbar/frameobjectbar.xml b/sw/uiconfig/swriter/toolbar/frameobjectbar.xml index 2c234283bcf1..5c293252eaa1 100644 --- a/sw/uiconfig/swriter/toolbar/frameobjectbar.xml +++ b/sw/uiconfig/swriter/toolbar/frameobjectbar.xml @@ -29,13 +29,13 @@ - - - - - - - + + + + + + + diff --git a/sw/uiconfig/swriter/toolbar/oleobjectbar.xml b/sw/uiconfig/swriter/toolbar/oleobjectbar.xml index 4acd385514bf..6cbf98575801 100644 --- a/sw/uiconfig/swriter/toolbar/oleobjectbar.xml +++ b/sw/uiconfig/swriter/toolbar/oleobjectbar.xml @@ -29,13 +29,13 @@ - - - - - - - + + + + + + + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/uiconfig sd/uiconfig sw/uiconfig
sc/uiconfig/scalc/toolbar/formcontrols.xml| 21 ++ sc/uiconfig/scalc/toolbar/moreformcontrols.xml| 17 +- sd/uiconfig/sdraw/toolbar/formcontrols.xml| 24 + sd/uiconfig/sdraw/toolbar/moreformcontrols.xml| 22 ++- sd/uiconfig/simpress/toolbar/formcontrols.xml | 24 + sd/uiconfig/simpress/toolbar/moreformcontrols.xml | 22 ++- sw/uiconfig/sglobal/toolbar/formcontrols.xml | 22 --- sw/uiconfig/sglobal/toolbar/moreformcontrols.xml | 22 ++- sw/uiconfig/swform/toolbar/formcontrols.xml | 22 --- sw/uiconfig/swform/toolbar/moreformcontrols.xml | 22 ++- sw/uiconfig/swreport/toolbar/formcontrols.xml | 22 --- sw/uiconfig/swreport/toolbar/moreformcontrols.xml | 22 ++- sw/uiconfig/swriter/toolbar/formcontrols.xml | 22 --- sw/uiconfig/swriter/toolbar/moreformcontrols.xml | 22 ++- sw/uiconfig/swxform/toolbar/formcontrols.xml | 25 ++ sw/uiconfig/swxform/toolbar/moreformcontrols.xml | 17 -- 16 files changed, 173 insertions(+), 175 deletions(-) New commits: commit f894386a8fe58639c295048fe7894f68613a0df1 Author: Yousuf Philips <philip...@hotmail.com> Date: Thu Dec 7 02:34:43 2017 +0400 tdf#81475 Organize the form toolbars Change-Id: Ic79b326c4c15f656ce533eb37bbd27853b8f4af7 Reviewed-on: https://gerrit.libreoffice.org/43861 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Yousuf Philips <philip...@hotmail.com> diff --git a/sc/uiconfig/scalc/toolbar/formcontrols.xml b/sc/uiconfig/scalc/toolbar/formcontrols.xml index 3a5cbb2b889b..70b962a73894 100644 --- a/sc/uiconfig/scalc/toolbar/formcontrols.xml +++ b/sc/uiconfig/scalc/toolbar/formcontrols.xml @@ -21,26 +21,29 @@ - - + + - + - - - + - + - + + + + + + - + diff --git a/sc/uiconfig/scalc/toolbar/moreformcontrols.xml b/sc/uiconfig/scalc/toolbar/moreformcontrols.xml index 796529fd550d..70bd84f6db41 100644 --- a/sc/uiconfig/scalc/toolbar/moreformcontrols.xml +++ b/sc/uiconfig/scalc/toolbar/moreformcontrols.xml @@ -18,20 +18,15 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> http://openoffice.org/2001/toolbar; xmlns:xlink="http://www.w3.org/1999/xlink; toolbar:id="toolbar"> - - - - - - + - - - - + - \ No newline at end of file + + + + diff --git a/sd/uiconfig/sdraw/toolbar/formcontrols.xml b/sd/uiconfig/sdraw/toolbar/formcontrols.xml index 3905ded90a70..f40d374ec59a 100644 --- a/sd/uiconfig/sdraw/toolbar/formcontrols.xml +++ b/sd/uiconfig/sdraw/toolbar/formcontrols.xml @@ -21,23 +21,29 @@ - - + + - + - - - + - + - - + + + + + + + + + + diff --git a/sd/uiconfig/sdraw/toolbar/moreformcontrols.xml b/sd/uiconfig/sdraw/toolbar/moreformcontrols.xml index 1b1bbcef1b61..14f2d133dc05 100644 --- a/sd/uiconfig/sdraw/toolbar/moreformcontrols.xml +++ b/sd/uiconfig/sdraw/toolbar/moreformcontrols.xml @@ -18,23 +18,15 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> http://openoffice.org/2001/toolbar; xmlns:xlink="http://www.w3.org/1999/xlink; toolbar:id="toolbar"> - - - - - - - - - - + - + - - + + - - \ No newline at end of file + + + diff --git a/sd/uiconfig/simpress/toolbar/formcontrols.xml b/sd/uiconfig/simpress/toolbar/formcontrols.xml index 3905ded90a70..f40d374ec59a 100644 --- a/sd/uiconfig/simpress/toolbar/formcontrols.xml +++ b/sd/uiconfig/simpress/toolbar/formcontrols.xml @@ -21,23 +21,29 @@ - - + + - + - - - + - + - - + + + + + + + + + + diff --git a/sd/uiconfig/simpress/toolbar/moreformcontrols.xml b/sd/uiconfig/simpress/toolbar/moreformcontrols.xml index 1b1bbcef1b61..14f2d133dc05 100644 --- a/sd/uiconfig/simpress/toolbar/moreformcontrols.xml +++ b/sd/uiconfig/simpress/toolbar/moreformcontrols.xml @@ -18,23 +18,15 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> http://openoffice.org/2001/toolbar; xmlns:xlink="http://www.w3.org/1999/xlink; toolbar:id="toolbar"> - - - - - - - - - - + - + - - + + - - \ No newline at end of file + + + diff --git a/sw/uiconfig/sglobal/toolbar/formcontrols.xml b/sw/uiconfig/sglobal/toolbar/formcontrols.xml index 17eaa87e0f27..f40d374ec59a 100644 --- a/sw/uiconfig/sglobal/toolbar/formcontrols.xml +++ b/sw/uiconfig/sglobal/toolbar/formcontrols.xml @@ -21,20 +21,26 @@ - - + + - + - - - + - + - + + + + + + + + + diff --git a/sw/uiconfig/sglobal/toolb
[Libreoffice-commits] core.git: sw/uiconfig
sw/uiconfig/swriter/ui/textgridpage.ui |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit d631d2aad44e2d2bc64fc01168b9a948f54b249f Author: Yousuf Philips <philip...@hotmail.com> Date: Thu Dec 14 04:00:29 2017 +0400 Dont translate strings replaced with text in code These are two labels in the Page dialog's Text Grid tab Change-Id: I77da5fab08fbd70825f3bfc46e1b12d7948291e0 Reviewed-on: https://gerrit.libreoffice.org/46431 Reviewed-by: Gabor Kelemen <kelem...@ubuntu.com> Tested-by: Gabor Kelemen <kelem...@ubuntu.com> diff --git a/sw/uiconfig/swriter/ui/textgridpage.ui b/sw/uiconfig/swriter/ui/textgridpage.ui index 80a8dd783d46..45485b9b67c2 100644 --- a/sw/uiconfig/swriter/ui/textgridpage.ui +++ b/sw/uiconfig/swriter/ui/textgridpage.ui @@ -220,7 +220,7 @@ True False start -(1-45) +(1-45) True @@ -262,7 +262,7 @@ False start 4 -(1-48) +(1-48) 2 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - icon-themes/breeze icon-themes/sifr
icon-themes/breeze/links.txt |4 ++-- icon-themes/sifr/links.txt |2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) New commits: commit 270b32755d5f524d9a7b5625ab4bf09bb0f835e8 Author: Yousuf Philips <philip...@hotmail.com> Date: Mon Dec 11 18:04:37 2017 +0400 tdf#114265 Use close icon in find in print preview Change-Id: I23d0fb9973d0ae8d0ed35e7dbace65a1ef298141 Reviewed-on: https://gerrit.libreoffice.org/46232 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Yousuf Philips <philip...@hotmail.com> (cherry picked from commit 62b08a7c7d1cb77906c8eab2218cba257e5be385) Reviewed-on: https://gerrit.libreoffice.org/46340 Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com> diff --git a/icon-themes/breeze/links.txt b/icon-themes/breeze/links.txt index fce62a1b8a59..314c6f4fd05b 100644 --- a/icon-themes/breeze/links.txt +++ b/icon-themes/breeze/links.txt @@ -432,16 +432,16 @@ cmd/sc_dsbeditdoc.png cmd/sc_editdoc.png # Quit cmd/lc_closemasterview.png cmd/lc_quit.png cmd/lc_closewin.png cmd/lc_quit.png -cmd/lc_closepreview.png cmd/lc_quit.png cmd/sc_closemasterview.png cmd/sc_quit.png cmd/sc_closewin.png cmd/sc_quit.png -cmd/sc_closepreview.png cmd/sc_quit.png # Close cmd/lc_closedocs.png cmd/lc_closedoc.png cmd/lc_exitsearch.png cmd/lc_closedoc.png +cmd/lc_closepreview.png cmd/lc_closedoc.png cmd/sc_closedocs.png cmd/sc_closedoc.png cmd/sc_exitsearch.png cmd/sc_closedoc.png +cmd/sc_closepreview.png cmd/sc_closedoc.png # arc cmd/lc_basicshapes.block-arc.png cmd/lc_arc.png diff --git a/icon-themes/sifr/links.txt b/icon-themes/sifr/links.txt index 58d9a65f5852..08af510ca16f 100644 --- a/icon-themes/sifr/links.txt +++ b/icon-themes/sifr/links.txt @@ -64,6 +64,8 @@ cmd/sc_exporttopdf.png cmd/sc_exportdirecttopdf.png # Print Preview Toolbar cmd/lc_showsinglepage.png cmd/lc_adddirect.png cmd/sc_showsinglepage.png cmd/sc_adddirect.png +cmd/lc_closepreview.png cmd/lc_exitsearch.png +cmd/sc_closepreview.png cmd/sc_exitsearch.png # Horizontal Text Alignment (align* is in calc and *para is used in writer) #cmd/lc_alignleft.png cmd/lc_leftpara.png ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: icon-themes/breeze icon-themes/sifr
icon-themes/breeze/links.txt |4 ++-- icon-themes/sifr/links.txt |2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) New commits: commit 62b08a7c7d1cb77906c8eab2218cba257e5be385 Author: Yousuf Philips <philip...@hotmail.com> Date: Mon Dec 11 18:04:37 2017 +0400 tdf#114265 Use close icon in find in print preview Change-Id: I23d0fb9973d0ae8d0ed35e7dbace65a1ef298141 Reviewed-on: https://gerrit.libreoffice.org/46232 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Yousuf Philips <philip...@hotmail.com> diff --git a/icon-themes/breeze/links.txt b/icon-themes/breeze/links.txt index fce62a1b8a59..314c6f4fd05b 100644 --- a/icon-themes/breeze/links.txt +++ b/icon-themes/breeze/links.txt @@ -432,16 +432,16 @@ cmd/sc_dsbeditdoc.png cmd/sc_editdoc.png # Quit cmd/lc_closemasterview.png cmd/lc_quit.png cmd/lc_closewin.png cmd/lc_quit.png -cmd/lc_closepreview.png cmd/lc_quit.png cmd/sc_closemasterview.png cmd/sc_quit.png cmd/sc_closewin.png cmd/sc_quit.png -cmd/sc_closepreview.png cmd/sc_quit.png # Close cmd/lc_closedocs.png cmd/lc_closedoc.png cmd/lc_exitsearch.png cmd/lc_closedoc.png +cmd/lc_closepreview.png cmd/lc_closedoc.png cmd/sc_closedocs.png cmd/sc_closedoc.png cmd/sc_exitsearch.png cmd/sc_closedoc.png +cmd/sc_closepreview.png cmd/sc_closedoc.png # arc cmd/lc_basicshapes.block-arc.png cmd/lc_arc.png diff --git a/icon-themes/sifr/links.txt b/icon-themes/sifr/links.txt index 58d9a65f5852..08af510ca16f 100644 --- a/icon-themes/sifr/links.txt +++ b/icon-themes/sifr/links.txt @@ -64,6 +64,8 @@ cmd/sc_exporttopdf.png cmd/sc_exportdirecttopdf.png # Print Preview Toolbar cmd/lc_showsinglepage.png cmd/lc_adddirect.png cmd/sc_showsinglepage.png cmd/sc_adddirect.png +cmd/lc_closepreview.png cmd/lc_exitsearch.png +cmd/sc_closepreview.png cmd/sc_exitsearch.png # Horizontal Text Alignment (align* is in calc and *para is used in writer) #cmd/lc_alignleft.png cmd/lc_leftpara.png ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: officecfg/registry qadevOOo/tests sw/inc sw/qa sw/source sw/uiconfig
officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu |8
qadevOOo/tests/java/ifc/style/_ParagraphProperties.java |8
qadevOOo/tests/java/mod/_sw/SwXParagraph.java |2 +-
sw/inc/poolfmt.hxx | 10
+-
sw/inc/strings.hrc | 10
+-
sw/qa/python/check_styles.py|2 +-
sw/source/core/doc/SwStyleNameMapper.cxx| 10
+-
sw/source/ui/vba/vbastyles.cxx | 10
+-
sw/uiconfig/sglobal/menubar/menubar.xml |4 ++--
sw/uiconfig/swriter/menubar/menubar.xml |4 ++--
sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui|4 ++--
sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui |4 ++--
12 files changed, 38 insertions(+), 38 deletions(-)
New commits:
commit 74c527abc0f3b5aa0fa179401ad05a79dc889973
Author: Yousuf Philips <philip...@hotmail.com>
Date: Tue Dec 5 13:54:29 2017 +0400
tdf#106988 New names for the new numbering styles
Change-Id: Ibc93aaa552652d61ac49652cf0ac5fcb68b48a12
Reviewed-on: https://gerrit.libreoffice.org/37995
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Michael Stahl <mst...@redhat.com>
diff --git
a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index d9225d631776..08127c537ee1 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -3121,7 +3121,7 @@
11
-
+
Number List
@@ -3134,13 +3134,13 @@
Number List Style
- .uno:StyleApply?Style:string=Numbering
1FamilyName:string=NumberingStyles
+ .uno:StyleApply?Style:string=Numbering
123FamilyName:string=NumberingStyles
11
-
+
Roman List
@@ -3153,7 +3153,7 @@
Roman List Style
- .uno:StyleApply?Style:string=Numbering
4FamilyName:string=NumberingStyles
+ .uno:StyleApply?Style:string=Numbering
IVXFamilyName:string=NumberingStyles
11
diff --git a/qadevOOo/tests/java/ifc/style/_ParagraphProperties.java
b/qadevOOo/tests/java/ifc/style/_ParagraphProperties.java
index 570e7b307ca6..d1f134b9f258 100644
--- a/qadevOOo/tests/java/ifc/style/_ParagraphProperties.java
+++ b/qadevOOo/tests/java/ifc/style/_ParagraphProperties.java
@@ -102,16 +102,16 @@ import com.sun.star.xml.AttributeData;
public class _ParagraphProperties extends MultiPropertyTest {
/**
* Custom tester for numbering style properties. Switches between
- * 'Numbering 1' and 'Numbering 2' styles.
+ * 'Numbering 123' and 'Numbering ABC' styles.
*/
protected PropertyTester NumberingStyleTester = new PropertyTester() {
@Override
protected Object getNewValue(String propName, Object oldValue)
throws java.lang.IllegalArgumentException {
-if ((oldValue != null) && (oldValue.equals("Numbering 1"))) {
-return "Numbering 2";
+if ((oldValue != null) && (oldValue.equals("Numbering 123"))) {
+return "Numbering ABC";
} else {
-return "Numbering 1";
+return "Numbering 123";
}
}
};
diff --git a/qadevOOo/tests/java/mod/_sw/SwXParagraph.java
b/qadevOOo/tests/java/mod/_sw/SwXParagraph.java
index 165e270454ef..c32d63b28527 100644
--- a/qadevOOo/tests/java/mod/_sw/SwXParagraph.java
+++ b/qadevOOo/tests/java/mod/_sw/SwXParagraph.java
@@ -196,7 +196,7 @@ public class SwXParagraph extends TestCase {
portP = UnoRuntime.queryInterface(XPropertySet.class, port);
paraP = UnoRuntime.queryInterface(XPropertySet.class, para);
-paraP.setPropertyValue("NumberingStyleName","Numbering 4");
+paraP.setPropertyValue("NumberingStyleName","Numbering IVX");
nRules = paraP.getPropertyValue("NumberingRules");
diff --git a/sw/inc/poolfmt.hxx b/sw/inc/poolfmt.hxx
index 2ef34a0a9fa5..025ea9fc0b89 100644
--- a/sw/inc/poolfmt.hxx
+++ b/sw/inc/poolfmt.hxx
@@ -187,11 +187,11 @@ RES_POOLPAGE_END
enum RES_POOL_NUMRULE_TYPE
{
RES_POOLNUMRULE_BEGIN = POOLGRP_NUMRULE,
-RES_POOLNUMRULE_NUM1 = RES_POOLNUMRULE_BEGIN, ///< NumRule Numbering 1.
-RES_POOLNUMRULE_NUM2,
[Libreoffice-commits] core.git: sw/inc
sw/inc/app.hrc | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 9e2b4bc6c4ade65788a0763dadf85f1e8be2b2d3
Author: Yousuf Philips <philip...@hotmail.com>
Date: Wed Dec 6 15:57:45 2017 +0400
tdf#114275 Use 'All Styles' for all style types
Change-Id: I3a43d5cc3f19e789686afae47b7ffb223305971e
Reviewed-on: https://gerrit.libreoffice.org/45939
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Yousuf Philips <philip...@hotmail.com>
diff --git a/sw/inc/app.hrc b/sw/inc/app.hrc
index fdb9f6f11f98..352bab8ecfbc 100644
--- a/sw/inc/app.hrc
+++ b/sw/inc/app.hrc
@@ -44,7 +44,7 @@ const std::pair RID_PARAGRAPHSTYLEFAMILY[] =
const std::pair RID_CHARACTERSTYLEFAMILY[] =
{
-{ NC_("RID_CHARACTERSTYLEFAMILY", "All") ,
SFXSTYLEBIT_ALL_VISIBLE },
+{ NC_("RID_CHARACTERSTYLEFAMILY", "All Styles") ,
SFXSTYLEBIT_ALL_VISIBLE },
{ NC_("RID_CHARACTERSTYLEFAMILY", "Hidden Styles") , SFXSTYLEBIT_HIDDEN
},
{ NC_("RID_CHARACTERSTYLEFAMILY", "Applied Styles") , SFXSTYLEBIT_USED
},
{ NC_("RID_CHARACTERSTYLEFAMILY", "Custom Styles") , SFXSTYLEBIT_USERDEF
},
@@ -53,7 +53,7 @@ const std::pair RID_CHARACTERSTYLEFAMILY[] =
const std::pair RID_FRAMESTYLEFAMILY[] =
{
-{ NC_("RID_FRAMESTYLEFAMILY", "All") , SFXSTYLEBIT_ALL_VISIBLE
},
+{ NC_("RID_FRAMESTYLEFAMILY", "All Styles") , SFXSTYLEBIT_ALL_VISIBLE
},
{ NC_("RID_FRAMESTYLEFAMILY", "Hidden Styles") , SFXSTYLEBIT_HIDDEN},
{ NC_("RID_FRAMESTYLEFAMILY", "Applied Styles") , SFXSTYLEBIT_USED },
{ NC_("RID_FRAMESTYLEFAMILY", "Custom Styles") , SFXSTYLEBIT_USERDEF },
@@ -62,7 +62,7 @@ const std::pair RID_FRAMESTYLEFAMILY[] =
const std::pair RID_PAGESTYLEFAMILY[] =
{
-{ NC_("RID_PAGESTYLEFAMILY", "All") , SFXSTYLEBIT_ALL_VISIBLE
},
+{ NC_("RID_PAGESTYLEFAMILY", "All Styles") , SFXSTYLEBIT_ALL_VISIBLE
},
{ NC_("RID_PAGESTYLEFAMILY", "Hidden Styles") , SFXSTYLEBIT_HIDDEN},
{ NC_("RID_PAGESTYLEFAMILY", "Applied Styles") , SFXSTYLEBIT_USED },
{ NC_("RID_PAGESTYLEFAMILY", "Custom Styles") , SFXSTYLEBIT_USERDEF },
@@ -71,7 +71,7 @@ const std::pair RID_PAGESTYLEFAMILY[] =
const std::pair RID_LISTSTYLEFAMILY[] =
{
-{ NC_("RID_LISTSTYLEFAMILY", "All") , SFXSTYLEBIT_ALL_VISIBLE
},
+{ NC_("RID_LISTSTYLEFAMILY", "All Styles") , SFXSTYLEBIT_ALL_VISIBLE
},
{ NC_("RID_LISTSTYLEFAMILY", "Hidden Styles") , SFXSTYLEBIT_HIDDEN},
{ NC_("RID_LISTSTYLEFAMILY", "Applied Styles") , SFXSTYLEBIT_USED },
{ NC_("RID_LISTSTYLEFAMILY", "Custom Styles") , SFXSTYLEBIT_USERDEF },
@@ -80,7 +80,7 @@ const std::pair RID_LISTSTYLEFAMILY[] =
const std::pair RID_TABLESTYLEFAMILY[] =
{
-{ NC_("RID_TABLESTYLEFAMILY", "All") , SFXSTYLEBIT_ALL_VISIBLE
},
+{ NC_("RID_TABLESTYLEFAMILY", "All Styles") , SFXSTYLEBIT_ALL_VISIBLE
},
{ NC_("RID_TABLESTYLEFAMILY", "Hidden Styles") , SFXSTYLEBIT_HIDDEN},
{ NC_("RID_TABLESTYLEFAMILY", "Applied Styles") , SFXSTYLEBIT_USED },
{ NC_("RID_TABLESTYLEFAMILY", "Custom Styles") , SFXSTYLEBIT_USERDEF },
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/uiconfig
sw/uiconfig/swriter/menubar/menubar.xml | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) New commits: commit 58e6ef08271f51486e37edeaa287a6d54b2b9720 Author: Yousuf Philips <philip...@hotmail.com> Date: Thu Dec 7 02:48:43 2017 +0400 tdf91781 Small reorganization and shrinking of the form menu Change-Id: Icaad5b6769da227f7ec3b13c6d793e6464e2ffc9 Reviewed-on: https://gerrit.libreoffice.org/45999 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Yousuf Philips <philip...@hotmail.com> diff --git a/sw/uiconfig/swriter/menubar/menubar.xml b/sw/uiconfig/swriter/menubar/menubar.xml index 1f7366733f59..d8ec9694ecc1 100644 --- a/sw/uiconfig/swriter/menubar/menubar.xml +++ b/sw/uiconfig/swriter/menubar/menubar.xml @@ -631,7 +631,7 @@ - + @@ -644,21 +644,21 @@ - - + - + + + + - - @@ -668,8 +668,8 @@ + - ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/inc sd/source sd/uiconfig
sd/inc/strings.hrc|2 ++
sd/source/ui/sidebar/SlideBackground.cxx |6 +++---
sd/uiconfig/simpress/ui/sidebarslidebackground.ui |6 +++---
3 files changed, 8 insertions(+), 6 deletions(-)
New commits:
commit c5505f5a22917c339af4e4c840a6a1ae20e2503f
Author: Yousuf Philips <philip...@hotmail.com>
Date: Wed Dec 6 18:01:03 2017 +0400
tdf#89466 Fix minor localization bugs
Change-Id: I1ee93f81dcd83b5a9277ea444ec8e10db7d790df
Reviewed-on: https://gerrit.libreoffice.org/45958
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Katarina Behrens <katarina.behr...@cib.de>
diff --git a/sd/inc/strings.hrc b/sd/inc/strings.hrc
index 924bc5acdc42..52b5d6796cdd 100644
--- a/sd/inc/strings.hrc
+++ b/sd/inc/strings.hrc
@@ -280,7 +280,9 @@
#define STR_PAGE_NAME NC_("STR_PAGE_NAME",
"Page" )
#define STR_SLIDE_NAME NC_("STR_SLIDE_NAME",
"Slide" )
#define STR_MASTERSLIDE_NAME
NC_("STR_MASTERSLIDE_NAME", "Master Slide")
+#define STR_MASTERSLIDE_LABEL
NC_("STR_MASTERSLIDE_LABEL", "Master Slide:")
#define STR_MASTERPAGE_NAME
NC_("STR_MASTERPAGE_NAME", "Master Page")
+#define STR_MASTERPAGE_LABEL
NC_("STR_MASTERPAGE_LABEL", "Master Page:")
#define STR_NOTES NC_("STR_NOTES",
"(Notes)" )
#define STR_HANDOUT NC_("STR_HANDOUT",
"Handouts" )
#define STR_PRESOBJ_MPTITLE
NC_("STR_PRESOBJ_MPTITLE", "Click to edit the title text format" )
diff --git a/sd/source/ui/sidebar/SlideBackground.cxx
b/sd/source/ui/sidebar/SlideBackground.cxx
index 8b2e15dc7671..9c94a208b2cb 100644
--- a/sd/source/ui/sidebar/SlideBackground.cxx
+++ b/sd/source/ui/sidebar/SlideBackground.cxx
@@ -239,7 +239,7 @@ void SlideBackground::HandleContextChange(
if ( IsImpress() )
{
-mpMasterLabel->SetText(SdResId(STR_MASTERSLIDE_NAME));
+mpMasterLabel->SetText(SdResId(STR_MASTERSLIDE_LABEL));
mpMarginSelectBox->Hide();
if ( maContext == maImpressMasterContext )
@@ -294,7 +294,7 @@ void SlideBackground::HandleContextChange(
}
else if ( IsDraw() )
{
-mpMasterLabel->SetText(SdResId(STR_MASTERPAGE_NAME));
+mpMasterLabel->SetText(SdResId(STR_MASTERPAGE_LABEL));
}
}
@@ -558,7 +558,7 @@ IMPL_LINK(SlideBackground, EventMultiplexerListener,
}
else if ( maContext == maImpressNotesContext )
{
-mpMasterLabel->SetText(SdResId(STR_MASTERSLIDE_NAME));
+mpMasterLabel->SetText(SdResId(STR_MASTERSLIDE_LABEL));
ViewShell* pMainViewShell =
mrBase.GetMainViewShell().get();
if (pMainViewShell)
diff --git a/sd/uiconfig/simpress/ui/sidebarslidebackground.ui
b/sd/uiconfig/simpress/ui/sidebarslidebackground.ui
index 70bccb25c7c8..55783273dfe7 100644
--- a/sd/uiconfig/simpress/ui/sidebarslidebackground.ui
+++ b/sd/uiconfig/simpress/ui/sidebarslidebackground.ui
@@ -194,7 +194,7 @@
True
False
end
-Orientation:
+Orientation:
0
@@ -209,7 +209,7 @@
True
-Master Slide
+Master View
True
True
True
@@ -264,7 +264,7 @@
True
False
end
-Margin:
+Margin:
0
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: officecfg/registry sd/uiconfig
officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu | 32 ++ sd/uiconfig/simpress/menubar/menubar.xml | 8 +- 2 files changed, 36 insertions(+), 4 deletions(-) New commits: commit 495ac1bc97f3deea8e13cb1a2b9f59d087873c3f Author: Yousuf Philips <philip...@hotmail.com> Date: Sat Dec 2 22:18:10 2017 +0400 tdf#114207 create commands for slide number and slide fields Change-Id: I5b7cfaf602568d9254dfeafd6afe27b9b0895d37 Reviewed-on: https://gerrit.libreoffice.org/45722 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Yousuf Philips <philip...@hotmail.com> diff --git a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu index 9bc0208e54d6..c91b33b9fe9e 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu @@ -500,16 +500,40 @@ ~Page Number + + + ~Slide Number + + + .uno:InsertPageField + + Page Tit~le + + + Slide Tit~le + + + .uno:InsertPageTitleField + + Page ~Count + + + Slide ~Count + + + .uno:InsertPagesField + + F~ields... @@ -1629,6 +1653,14 @@ P~age Number... + + + S~lide Number... + + + .uno:InsertPageNumber + + Date and ~Time... diff --git a/sd/uiconfig/simpress/menubar/menubar.xml b/sd/uiconfig/simpress/menubar/menubar.xml index 0de1b9dadd42..c146eb1ac5ca 100644 --- a/sd/uiconfig/simpress/menubar/menubar.xml +++ b/sd/uiconfig/simpress/menubar/menubar.xml @@ -241,7 +241,7 @@ - + @@ -250,9 +250,9 @@ - - - + + + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/uiconfig
sw/uiconfig/sglobal/toolbar/frameobjectbar.xml | 14 +++--- sw/uiconfig/sglobal/toolbar/oleobjectbar.xml | 14 +++--- sw/uiconfig/swriter/toolbar/frameobjectbar.xml | 14 +++--- sw/uiconfig/swriter/toolbar/oleobjectbar.xml | 14 +++--- 4 files changed, 28 insertions(+), 28 deletions(-) New commits: commit 24f50a40fc704b92a0aa6017f1877b4399926640 Author: Yousuf Philips <philip...@hotmail.com> Date: Tue Dec 5 12:52:44 2017 +0400 tdf#37697 Use object alignment buttons rather than text alignment Change-Id: Ia100a29aefaca81c5282f8077feb319f9d1809cb Reviewed-on: https://gerrit.libreoffice.org/45850 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Yousuf Philips <philip...@hotmail.com> diff --git a/sw/uiconfig/sglobal/toolbar/frameobjectbar.xml b/sw/uiconfig/sglobal/toolbar/frameobjectbar.xml index 2c234283bcf1..5c293252eaa1 100644 --- a/sw/uiconfig/sglobal/toolbar/frameobjectbar.xml +++ b/sw/uiconfig/sglobal/toolbar/frameobjectbar.xml @@ -29,13 +29,13 @@ - - - - - - - + + + + + + + diff --git a/sw/uiconfig/sglobal/toolbar/oleobjectbar.xml b/sw/uiconfig/sglobal/toolbar/oleobjectbar.xml index 4acd385514bf..6cbf98575801 100644 --- a/sw/uiconfig/sglobal/toolbar/oleobjectbar.xml +++ b/sw/uiconfig/sglobal/toolbar/oleobjectbar.xml @@ -29,13 +29,13 @@ - - - - - - - + + + + + + + diff --git a/sw/uiconfig/swriter/toolbar/frameobjectbar.xml b/sw/uiconfig/swriter/toolbar/frameobjectbar.xml index 2c234283bcf1..5c293252eaa1 100644 --- a/sw/uiconfig/swriter/toolbar/frameobjectbar.xml +++ b/sw/uiconfig/swriter/toolbar/frameobjectbar.xml @@ -29,13 +29,13 @@ - - - - - - - + + + + + + + diff --git a/sw/uiconfig/swriter/toolbar/oleobjectbar.xml b/sw/uiconfig/swriter/toolbar/oleobjectbar.xml index 4acd385514bf..6cbf98575801 100644 --- a/sw/uiconfig/swriter/toolbar/oleobjectbar.xml +++ b/sw/uiconfig/swriter/toolbar/oleobjectbar.xml @@ -29,13 +29,13 @@ - - - - - - - + + + + + + + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - cui/uiconfig
cui/uiconfig/ui/paragalignpage.ui |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 8aafeb3c72b79acffab0c608e8f4037a80296f53 Author: Yousuf Philips <philip...@hotmail.com> Date: Tue Oct 17 10:10:32 2017 +0400 tdf#98211 make last line default value language neutral Change-Id: Ieccb174debbfb00e8165c5928ea9786d55bffab3 Reviewed-on: https://gerrit.libreoffice.org/43224 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Yousuf Philips <philip...@hotmail.com> (cherry picked from commit b0ca7c2e8122f7f3445835ef51d8396eb0969412) Reviewed-on: https://gerrit.libreoffice.org/45707 Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com> diff --git a/cui/uiconfig/ui/paragalignpage.ui b/cui/uiconfig/ui/paragalignpage.ui index ba90b60a3fee..5040d2ce13ef 100644 --- a/cui/uiconfig/ui/paragalignpage.ui +++ b/cui/uiconfig/ui/paragalignpage.ui @@ -12,11 +12,11 @@ -Default +Start 0 -Left +Start 1 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - include/svx svx/inc svx/source
include/svx/strings.hrc| 23 -
svx/inc/strings.hxx| 23 -
svx/source/unodraw/unoprov.cxx | 44 -
3 files changed, 90 deletions(-)
New commits:
commit 6a0e03bc6c1d6e9f3b66459d82274ecad7f16f58
Author: Yousuf Philips <philip...@hotmail.com>
Date: Thu Nov 16 21:33:10 2017 +0200
Revert "tdf#105000, related tdf#87538: Make new color names translatable"
No need for this if we will be removing tango and we shouldnt have
translators waste time translating it if so.
https://bugs.documentfoundation.org/show_bug.cgi?id=113858
This reverts commit 6999bafb8675461a7f1400880eabd2daffe96ba4.
Change-Id: I7b6fe1fc84530bdbc002fcb2857942ddf268c88e
Reviewed-on: https://gerrit.libreoffice.org/44837
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Yousuf Philips <philip...@hotmail.com>
(cherry picked from commit 83638a195dfde7255115cac84b2e9bb7e8e1b440)
Reviewed-on: https://gerrit.libreoffice.org/45708
Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>
diff --git a/include/svx/strings.hrc b/include/svx/strings.hrc
index 2aad6c092bdc..a528db2322c1 100644
--- a/include/svx/strings.hrc
+++ b/include/svx/strings.hrc
@@ -601,29 +601,6 @@
#define RID_SVXSTR_COLOR_DARKTEAL
NC_("RID_SVXSTR_COLOR_DARKTEAL", "Dark Teal")
#define RID_SVXSTR_COLOR_DARKGREEN
NC_("RID_SVXSTR_COLOR_DARKGREEN", "Dark Green")
#define RID_SVXSTR_COLOR_DARKLIME
NC_("RID_SVXSTR_COLOR_DARKLIME", "Dark Lime")
-// Elements of the Tango color palette
-#define RID_SVXSTR_COLOR_BUTTERL
NC_("RID_SVXSTR_COLOR_BUTTERL", "Butter Light")
-#define RID_SVXSTR_COLOR_BUTTERM
NC_("RID_SVXSTR_COLOR_BUTTERM", "Butter Medium")
-#define RID_SVXSTR_COLOR_BUTTERD
NC_("RID_SVXSTR_COLOR_BUTTERD", "Butter Dark")
-#define RID_SVXSTR_COLOR_ORANGEL
NC_("RID_SVXSTR_COLOR_ORANGEL", "Orange Light")
-#define RID_SVXSTR_COLOR_ORANGEM
NC_("RID_SVXSTR_COLOR_ORANGEM", "Orange Medium")
-#define RID_SVXSTR_COLOR_ORANGED
NC_("RID_SVXSTR_COLOR_ORANGED", "Orange Dark")
-#define RID_SVXSTR_COLOR_CHOCOLATEL
NC_("RID_SVXSTR_COLOR_CHOCOLATEL", "Chocolate Light")
-#define RID_SVXSTR_COLOR_CHOCOLATEM
NC_("RID_SVXSTR_COLOR_CHOCOLATEM", "Chocolate Medium")
-#define RID_SVXSTR_COLOR_CHOCOLATED
NC_("RID_SVXSTR_COLOR_CHOCOLATED", "Chocolate Dark")
-#define RID_SVXSTR_COLOR_CHAMELEONL
NC_("RID_SVXSTR_COLOR_CHAMELEONL", "Chameleon Light")
-#define RID_SVXSTR_COLOR_CHAMELEONM
NC_("RID_SVXSTR_COLOR_CHAMELEONM", "Chameleon Medium")
-#define RID_SVXSTR_COLOR_CHAMELEOND
NC_("RID_SVXSTR_COLOR_CHAMELEOND", "Chameleon Dark")
-#define RID_SVXSTR_COLOR_SKYBLUEL
NC_("RID_SVXSTR_COLOR_SKYBLUEL", "Sky Blue Light")
-#define RID_SVXSTR_COLOR_SKYBLUEM
NC_("RID_SVXSTR_COLOR_SKYBLUEM", "Sky Blue Medium")
-#define RID_SVXSTR_COLOR_SKYBLUED
NC_("RID_SVXSTR_COLOR_SKYBLUED", "Sky Blue Dark")
-#define RID_SVXSTR_COLOR_PLUML
NC_("RID_SVXSTR_COLOR_PLUML", "Plum Light")
-#define RID_SVXSTR_COLOR_PLUMM
NC_("RID_SVXSTR_COLOR_PLUMM", "Plum Medium")
-#define RID_SVXSTR_COLOR_PLUMD
NC_("RID_SVXSTR_COLOR_PLUMD", "Plum Dark")
-#define RID_SVXSTR_COLOR_SCARLETREDL
NC_("RID_SVXSTR_COLOR_SCARLETREDL", "Scarlet Red Light")
-#define RID_SVXSTR_COLOR_SCARLETREDM
NC_("RID_SVXSTR_COLOR_SCARLETREDM", "Scarlet Red Medium")
-#define RID_SVXSTR_COLOR_SCARLETREDD
NC_("RID_SVXSTR_COLOR_SCARLETREDD", "Scarlet Red Dark")
-#define RID_SVXSTR_COLOR_ALUMINIUM
NC_("RID_SVXSTR_COLOR_ALUMINIUM", "Aluminium")
/* Old default color names, probably often used in saved files */
#define RID_SVXSTR_COLOR_BLUE_CLASSIC
NC_("RID_SVXSTR_COLOR_BLUE_CLASSIC", "Blue classic")
#define RID_SVXSTR_COLOR_CYAN
NC_("RID_SVXSTR_COLOR_CYAN", &
[Libreoffice-commits] core.git: include/svx svx/inc svx/source
include/svx/strings.hrc| 23 -
svx/inc/strings.hxx| 23 -
svx/source/unodraw/unoprov.cxx | 44 -
3 files changed, 90 deletions(-)
New commits:
commit 83638a195dfde7255115cac84b2e9bb7e8e1b440
Author: Yousuf Philips <philip...@hotmail.com>
Date: Thu Nov 16 21:33:10 2017 +0200
Revert "tdf#105000, related tdf#87538: Make new color names translatable"
No need for this if we will be removing tango and we shouldnt have
translators waste time translating it if so.
https://bugs.documentfoundation.org/show_bug.cgi?id=113858
This reverts commit 6999bafb8675461a7f1400880eabd2daffe96ba4.
Change-Id: I7b6fe1fc84530bdbc002fcb2857942ddf268c88e
Reviewed-on: https://gerrit.libreoffice.org/44837
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Yousuf Philips <philip...@hotmail.com>
diff --git a/include/svx/strings.hrc b/include/svx/strings.hrc
index 2aad6c092bdc..a528db2322c1 100644
--- a/include/svx/strings.hrc
+++ b/include/svx/strings.hrc
@@ -601,29 +601,6 @@
#define RID_SVXSTR_COLOR_DARKTEAL
NC_("RID_SVXSTR_COLOR_DARKTEAL", "Dark Teal")
#define RID_SVXSTR_COLOR_DARKGREEN
NC_("RID_SVXSTR_COLOR_DARKGREEN", "Dark Green")
#define RID_SVXSTR_COLOR_DARKLIME
NC_("RID_SVXSTR_COLOR_DARKLIME", "Dark Lime")
-// Elements of the Tango color palette
-#define RID_SVXSTR_COLOR_BUTTERL
NC_("RID_SVXSTR_COLOR_BUTTERL", "Butter Light")
-#define RID_SVXSTR_COLOR_BUTTERM
NC_("RID_SVXSTR_COLOR_BUTTERM", "Butter Medium")
-#define RID_SVXSTR_COLOR_BUTTERD
NC_("RID_SVXSTR_COLOR_BUTTERD", "Butter Dark")
-#define RID_SVXSTR_COLOR_ORANGEL
NC_("RID_SVXSTR_COLOR_ORANGEL", "Orange Light")
-#define RID_SVXSTR_COLOR_ORANGEM
NC_("RID_SVXSTR_COLOR_ORANGEM", "Orange Medium")
-#define RID_SVXSTR_COLOR_ORANGED
NC_("RID_SVXSTR_COLOR_ORANGED", "Orange Dark")
-#define RID_SVXSTR_COLOR_CHOCOLATEL
NC_("RID_SVXSTR_COLOR_CHOCOLATEL", "Chocolate Light")
-#define RID_SVXSTR_COLOR_CHOCOLATEM
NC_("RID_SVXSTR_COLOR_CHOCOLATEM", "Chocolate Medium")
-#define RID_SVXSTR_COLOR_CHOCOLATED
NC_("RID_SVXSTR_COLOR_CHOCOLATED", "Chocolate Dark")
-#define RID_SVXSTR_COLOR_CHAMELEONL
NC_("RID_SVXSTR_COLOR_CHAMELEONL", "Chameleon Light")
-#define RID_SVXSTR_COLOR_CHAMELEONM
NC_("RID_SVXSTR_COLOR_CHAMELEONM", "Chameleon Medium")
-#define RID_SVXSTR_COLOR_CHAMELEOND
NC_("RID_SVXSTR_COLOR_CHAMELEOND", "Chameleon Dark")
-#define RID_SVXSTR_COLOR_SKYBLUEL
NC_("RID_SVXSTR_COLOR_SKYBLUEL", "Sky Blue Light")
-#define RID_SVXSTR_COLOR_SKYBLUEM
NC_("RID_SVXSTR_COLOR_SKYBLUEM", "Sky Blue Medium")
-#define RID_SVXSTR_COLOR_SKYBLUED
NC_("RID_SVXSTR_COLOR_SKYBLUED", "Sky Blue Dark")
-#define RID_SVXSTR_COLOR_PLUML
NC_("RID_SVXSTR_COLOR_PLUML", "Plum Light")
-#define RID_SVXSTR_COLOR_PLUMM
NC_("RID_SVXSTR_COLOR_PLUMM", "Plum Medium")
-#define RID_SVXSTR_COLOR_PLUMD
NC_("RID_SVXSTR_COLOR_PLUMD", "Plum Dark")
-#define RID_SVXSTR_COLOR_SCARLETREDL
NC_("RID_SVXSTR_COLOR_SCARLETREDL", "Scarlet Red Light")
-#define RID_SVXSTR_COLOR_SCARLETREDM
NC_("RID_SVXSTR_COLOR_SCARLETREDM", "Scarlet Red Medium")
-#define RID_SVXSTR_COLOR_SCARLETREDD
NC_("RID_SVXSTR_COLOR_SCARLETREDD", "Scarlet Red Dark")
-#define RID_SVXSTR_COLOR_ALUMINIUM
NC_("RID_SVXSTR_COLOR_ALUMINIUM", "Aluminium")
/* Old default color names, probably often used in saved files */
#define RID_SVXSTR_COLOR_BLUE_CLASSIC
NC_("RID_SVXSTR_COLOR_BLUE_CLASSIC", "Blue classic")
#define RID_SVXSTR_COLOR_CYAN
NC_("RID_SVXSTR_COLOR_CYAN", "Cyan")
diff --git a/svx/inc/strings.hxx b/svx/inc/strings.hxx
index 5663812d2f92..20a2fb6046d0 100644
--- a/svx/inc/strings.hxx
+++ b/svx/inc/strings.hxx
@@ -77,29 +77,6 @@
#define R
[Libreoffice-commits] core.git: cui/uiconfig
cui/uiconfig/ui/paragalignpage.ui |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit b0ca7c2e8122f7f3445835ef51d8396eb0969412 Author: Yousuf Philips <philip...@hotmail.com> Date: Tue Oct 17 10:10:32 2017 +0400 tdf#98211 make last line default value language neutral Change-Id: Ieccb174debbfb00e8165c5928ea9786d55bffab3 Reviewed-on: https://gerrit.libreoffice.org/43224 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Yousuf Philips <philip...@hotmail.com> diff --git a/cui/uiconfig/ui/paragalignpage.ui b/cui/uiconfig/ui/paragalignpage.ui index ba90b60a3fee..5040d2ce13ef 100644 --- a/cui/uiconfig/ui/paragalignpage.ui +++ b/cui/uiconfig/ui/paragalignpage.ui @@ -12,11 +12,11 @@ -Default +Start 0 -Left +Start 1 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - sw/uiconfig
sw/uiconfig/swriter/ui/columnpage.ui |2 sw/uiconfig/swriter/ui/frmaddpage.ui |1 sw/uiconfig/swriter/ui/frmtypepage.ui | 119 +- 3 files changed, 22 insertions(+), 100 deletions(-) New commits: commit f259310a8b9508104e6a0c801bb5b71d38ca4551 Author: Yousuf Philips <philip...@hotmail.com> Date: Thu Nov 23 07:35:41 2017 +0400 tdf#113880 Fix a11y issues in tabs of the image properties dialog Change-Id: Ief5b95307cefe1091854ba872c37a702fe432b20 Reviewed-on: https://gerrit.libreoffice.org/45576 Reviewed-by: Caolán McNamara <caol...@redhat.com> Tested-by: Caolán McNamara <caol...@redhat.com> diff --git a/sw/uiconfig/swriter/ui/columnpage.ui b/sw/uiconfig/swriter/ui/columnpage.ui index bd701dddb4a7..fe1880b9caf1 100644 --- a/sw/uiconfig/swriter/ui/columnpage.ui +++ b/sw/uiconfig/swriter/ui/columnpage.ui @@ -699,6 +699,7 @@ True _Apply to: True +applytolb 1 @@ -723,6 +724,7 @@ True Text _direction: True +textdirectionlb 1 diff --git a/sw/uiconfig/swriter/ui/frmaddpage.ui b/sw/uiconfig/swriter/ui/frmaddpage.ui index 95ea41a1b8c9..caa443dd8549 100644 --- a/sw/uiconfig/swriter/ui/frmaddpage.ui +++ b/sw/uiconfig/swriter/ui/frmaddpage.ui @@ -205,6 +205,7 @@ False _Description: True +description:border 0 diff --git a/sw/uiconfig/swriter/ui/frmtypepage.ui b/sw/uiconfig/swriter/ui/frmtypepage.ui index 6fd3ca326498..7926bbf0cb43 100644 --- a/sw/uiconfig/swriter/ui/frmtypepage.ui +++ b/sw/uiconfig/swriter/ui/frmtypepage.ui @@ -1,7 +1,8 @@ + - - + + 0.050003 99.985 @@ -59,15 +60,12 @@ True True ⢠-True adjustment1 2 1 0 -1 -1 @@ -85,7 +83,6 @@ 0 2 2 -1 @@ -97,40 +94,34 @@ True False -0 _Width (at least) True width:0.00cm +0 0 1 -1 -1 True False -0 _Width True width:0.00cm +0 0 0 -1 -1 0 0 -1 -1 @@ -148,6 +139,9 @@ True 0 True + + + False @@ -172,15 +166,12 @@ 0 1 2 -1
[Libreoffice-commits] core.git: sw/uiconfig
sw/uiconfig/swriter/ui/columnpage.ui |2 sw/uiconfig/swriter/ui/frmaddpage.ui |1 sw/uiconfig/swriter/ui/frmtypepage.ui | 119 +- 3 files changed, 22 insertions(+), 100 deletions(-) New commits: commit cbc671d17a86195ebeea831a91b8401c0daa04d0 Author: Yousuf Philips <philip...@hotmail.com> Date: Thu Nov 23 07:35:41 2017 +0400 tdf#113880 Fix a11y issues in tabs of the image properties dialog Change-Id: Ief5b95307cefe1091854ba872c37a702fe432b20 Reviewed-on: https://gerrit.libreoffice.org/45121 Reviewed-by: Caolán McNamara <caol...@redhat.com> Tested-by: Caolán McNamara <caol...@redhat.com> diff --git a/sw/uiconfig/swriter/ui/columnpage.ui b/sw/uiconfig/swriter/ui/columnpage.ui index bd701dddb4a7..fe1880b9caf1 100644 --- a/sw/uiconfig/swriter/ui/columnpage.ui +++ b/sw/uiconfig/swriter/ui/columnpage.ui @@ -699,6 +699,7 @@ True _Apply to: True +applytolb 1 @@ -723,6 +724,7 @@ True Text _direction: True +textdirectionlb 1 diff --git a/sw/uiconfig/swriter/ui/frmaddpage.ui b/sw/uiconfig/swriter/ui/frmaddpage.ui index 95ea41a1b8c9..caa443dd8549 100644 --- a/sw/uiconfig/swriter/ui/frmaddpage.ui +++ b/sw/uiconfig/swriter/ui/frmaddpage.ui @@ -205,6 +205,7 @@ False _Description: True +description:border 0 diff --git a/sw/uiconfig/swriter/ui/frmtypepage.ui b/sw/uiconfig/swriter/ui/frmtypepage.ui index 6fd3ca326498..7926bbf0cb43 100644 --- a/sw/uiconfig/swriter/ui/frmtypepage.ui +++ b/sw/uiconfig/swriter/ui/frmtypepage.ui @@ -1,7 +1,8 @@ + - - + + 0.050003 99.985 @@ -59,15 +60,12 @@ True True ⢠-True adjustment1 2 1 0 -1 -1 @@ -85,7 +83,6 @@ 0 2 2 -1 @@ -97,40 +94,34 @@ True False -0 _Width (at least) True width:0.00cm +0 0 1 -1 -1 True False -0 _Width True width:0.00cm +0 0 0 -1 -1 0 0 -1 -1 @@ -148,6 +139,9 @@ True 0 True + + + False @@ -172,15 +166,12 @@ 0 1 2 -1
[Libreoffice-commits] core.git: extras/Package_palettes.mk extras/source
extras/Package_palettes.mk|2 --
extras/source/palettes/breeze.soc | 35 ---
extras/source/palettes/tango.soc | 35 ---
3 files changed, 72 deletions(-)
New commits:
commit 6481a06b066a744e4f1a41ce1b0ca8b27e5f39b4
Author: Yousuf Philips <philip...@hotmail.com>
Date: Thu Nov 23 14:25:02 2017 +0400
tdf#113858 Removal of tango and breeze palettes
Change-Id: I15426cfe13985d26348728e5f8b0a638bcbec84c
Reviewed-on: https://gerrit.libreoffice.org/45141
Reviewed-by: Heiko Tietze <tietze.he...@googlemail.com>
Tested-by: Yousuf Philips <philip...@hotmail.com>
diff --git a/extras/Package_palettes.mk b/extras/Package_palettes.mk
index 7750655e2058..dbd31c58d972 100644
--- a/extras/Package_palettes.mk
+++ b/extras/Package_palettes.mk
@@ -11,7 +11,6 @@ $(eval $(call
gb_Package_Package,extras_palettes,$(SRCDIR)/extras/source/palette
$(eval $(call
gb_Package_add_files,extras_palettes,$(LIBO_SHARE_FOLDER)/palette,\
arrowhd.soe \
- breeze.soc \
chart-palettes.soc \
classic.sog \
freecolour-hlc.soc \
@@ -27,7 +26,6 @@ $(eval $(call
gb_Package_add_files,extras_palettes,$(LIBO_SHARE_FOLDER)/palette,
standard.soh \
standard.sop \
styles.sod \
- tango.soc \
tonal.soc \
))
diff --git a/extras/source/palettes/breeze.soc
b/extras/source/palettes/breeze.soc
deleted file mode 100644
index 5dd65b2ea3f1..
--- a/extras/source/palettes/breeze.soc
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-http://www.w3.org/1999/xlink;
xmlns:svg="http://www.w3.org/2000/svg;
xmlns:ooo="http://openoffice.org/2004/office;>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/extras/source/palettes/tango.soc b/extras/source/palettes/tango.soc
deleted file mode 100644
index 88e75a33a0be..
--- a/extras/source/palettes/tango.soc
+++ /dev/null
@@ -1,35 +0,0 @@
-
-http://www.w3.org/1999/xlink;
xmlns:svg="http://www.w3.org/2000/svg;
xmlns:ooo="http://openoffice.org/2004/office;>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: officecfg/registry sc/uiconfig sw/uiconfig
officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |5 + officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu |5 - sc/uiconfig/scalc/menubar/menubar.xml|3 ++- sc/uiconfig/scalc/popupmenu/cell.xml |6 -- sw/uiconfig/sglobal/menubar/menubar.xml |2 +- sw/uiconfig/swriter/menubar/menubar.xml |2 +- 6 files changed, 13 insertions(+), 10 deletions(-) New commits: commit b2f79f363c02738bf9d3b4e7b2834214b8a52c96 Author: Yousuf Philips <philip...@hotmail.com> Date: Wed Nov 22 17:56:53 2017 +0400 tdf#50746 add paste unformatted to menu and context menu also unified menus and context menus in writer and calc Change-Id: I929df7a0fe2be7b8bf58cf048e53536ea89d5c9c Reviewed-on: https://gerrit.libreoffice.org/45095 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Eike Rathke <er...@redhat.com> diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu index 6b755820bb41..791ebefce51b 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu @@ -6036,6 +6036,11 @@ + + + Paste ~Special + + St~yle diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu index 5b3c5ed09ae9..fb87ee73b526 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu @@ -2635,11 +2635,6 @@ - - - Paste ~Special - - T~able diff --git a/sc/uiconfig/scalc/menubar/menubar.xml b/sc/uiconfig/scalc/menubar/menubar.xml index 812903a8de48..0a4136d3c242 100644 --- a/sc/uiconfig/scalc/menubar/menubar.xml +++ b/sc/uiconfig/scalc/menubar/menubar.xml @@ -84,7 +84,7 @@ - + @@ -92,6 +92,7 @@ + diff --git a/sc/uiconfig/scalc/popupmenu/cell.xml b/sc/uiconfig/scalc/popupmenu/cell.xml index 57ecd2864069..7412caf636ff 100644 --- a/sc/uiconfig/scalc/popupmenu/cell.xml +++ b/sc/uiconfig/scalc/popupmenu/cell.xml @@ -11,12 +11,14 @@ - - + + + + diff --git a/sw/uiconfig/sglobal/menubar/menubar.xml b/sw/uiconfig/sglobal/menubar/menubar.xml index e492f604017c..19b9c3fabbaf 100644 --- a/sw/uiconfig/sglobal/menubar/menubar.xml +++ b/sw/uiconfig/sglobal/menubar/menubar.xml @@ -93,8 +93,8 @@ - + diff --git a/sw/uiconfig/swriter/menubar/menubar.xml b/sw/uiconfig/swriter/menubar/menubar.xml index b5ba20d1f96d..1f7366733f59 100644 --- a/sw/uiconfig/swriter/menubar/menubar.xml +++ b/sw/uiconfig/swriter/menubar/menubar.xml @@ -93,8 +93,8 @@ - + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/uiconfig
cui/uiconfig/ui/backgroundpage.ui | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) New commits: commit 4b7490fe49bb93f895e974602a2616fa80b74019 Author: Yousuf Philips <philip...@hotmail.com> Date: Tue Nov 21 02:19:39 2017 +0400 tdf#113880 a11y: improve accessibility of table background tab Change-Id: I978340f88a8e007dbf080113a933063c5546fd51 Reviewed-on: https://gerrit.libreoffice.org/45011 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Katarina Behrens <katarina.behr...@cib.de> diff --git a/cui/uiconfig/ui/backgroundpage.ui b/cui/uiconfig/ui/backgroundpage.ui index c29f179da611..0fd12039a476 100644 --- a/cui/uiconfig/ui/backgroundpage.ui +++ b/cui/uiconfig/ui/backgroundpage.ui @@ -44,6 +44,7 @@ True A_s: True +selectlb 0 @@ -67,9 +68,10 @@ False True -0 F_or: True +tablelb +0 2 @@ -258,8 +260,8 @@ False True True -0 FILENAME +0 0 @@ -271,8 +273,8 @@ True False True -0 Unlinked image +0 0 @@ -283,8 +285,8 @@ False True -0 Find images +0 0 @@ -474,8 +476,6 @@ 1 - - 0 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/uiconfig
cui/uiconfig/ui/gradientpage.ui |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 921c8f50132de4042860956e102389c239da638a Author: Yousuf Philips <philip...@hotmail.com> Date: Tue Nov 21 18:00:03 2017 +0400 Remove space before colon in gradient tab of area tab Change-Id: I9699d4065850f953e71a581488d0ca7cc62351f8 Reviewed-on: https://gerrit.libreoffice.org/45034 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Katarina Behrens <katarina.behr...@cib.de> diff --git a/cui/uiconfig/ui/gradientpage.ui b/cui/uiconfig/ui/gradientpage.ui index 92b23f02b12b..e6debc895853 100644 --- a/cui/uiconfig/ui/gradientpage.ui +++ b/cui/uiconfig/ui/gradientpage.ui @@ -296,7 +296,7 @@ True False -Center ( X / Y ) : +Center ( X / Y ): True 0 0.4399761581421 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/uiconfig
cui/uiconfig/ui/gradientpage.ui | 178
1 file changed, 109 insertions(+), 69 deletions(-)
New commits:
commit b67ffbda5602b9ffa7964a7ecb5dcd1fc8b998fa
Author: Yousuf Philips <philip...@hotmail.com>
Date: Mon Nov 20 21:38:19 2017 +0400
tdf#113880 a11y: make gradient tab of area tab accessible
Change-Id: I45ac3770851ff25f576190abe73c59e30fc78879
Reviewed-on: https://gerrit.libreoffice.org/44857
Reviewed-by: Katarina Behrens <katarina.behr...@cib.de>
Tested-by: Yousuf Philips <philip...@hotmail.com>
diff --git a/cui/uiconfig/ui/gradientpage.ui b/cui/uiconfig/ui/gradientpage.ui
index bca24795a82f..92b23f02b12b 100644
--- a/cui/uiconfig/ui/gradientpage.ui
+++ b/cui/uiconfig/ui/gradientpage.ui
@@ -1,8 +1,8 @@
-
+
-
+
3
256
@@ -42,11 +42,11 @@
6
-True
-False
-True
-True
-
+True
+False
+True
+True
+
False
True
@@ -146,9 +146,10 @@
True
False
-0
_Type:
True
+gradienttypelb
+0
False
@@ -179,7 +180,7 @@
False
True
-1
+0
@@ -193,15 +194,15 @@
True
False
+Increment:
+True
+incrementmtr
0
0.4399761581421
-Increment:
0
0
-1
-1
@@ -215,8 +216,6 @@
0
2
-1
-1
@@ -229,24 +228,21 @@
1
2
-1
-1
-Automatic
+A_utomatic
True
True
False
+True
0
True
0
1
-1
-1
@@ -259,7 +255,7 @@
False
True
-2
+1
@@ -273,16 +269,15 @@
True
False
-0
-0.4399761581421
A_ngle:
True
+anglemtr:0degrees
+0
+0.4399761581421
1
0
-1
-1
@@ -295,24 +290,20 @@
1
1
-1
-1
True
False
-0
-0.4399761581421
Center ( X / Y ) :
True
+0
+0.4399761581421
0
0
-1
-1
@@ -353,15 +344,13 @@
0
1
-1
-
[Libreoffice-commits] core.git: sd/source
sd/source/ui/controller/displaymodecontroller.cxx |8
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 6bc69fa2d37b8a35dbf98218a2f6514e4d7b43bc
Author: Yousuf Philips <philip...@hotmail.com>
Date: Thu Oct 26 16:30:02 2017 +0400
tdf#95946 correct order of buttons in the display mode control
Change-Id: Ib5444ebd39acdef9988f1ac361816feff8258f90
Reviewed-on: https://gerrit.libreoffice.org/43966
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Yousuf Philips <philip...@hotmail.com>
Tested-by: Yousuf Philips <philip...@hotmail.com>
Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>
diff --git a/sd/source/ui/controller/displaymodecontroller.cxx
b/sd/source/ui/controller/displaymodecontroller.cxx
index 3b0d2fe99d61..53642cff6d76 100644
--- a/sd/source/ui/controller/displaymodecontroller.cxx
+++ b/sd/source/ui/controller/displaymodecontroller.cxx
@@ -82,13 +82,13 @@ static const snewfoil_value_info editmodes[] =
STR_NORMAL_MODE,
".uno:NormalMultiPaneGUI" },
{2,
-BMP_DISPLAYMODE_NOTES,
-STR_NOTES_MODE,
-".uno:NotesMode" },
-{3,
BMP_DISPLAYMODE_OUTLINE,
STR_OUTLINE_MODE,
".uno:OutlineMode" },
+{3,
+BMP_DISPLAYMODE_NOTES,
+STR_NOTES_MODE,
+".uno:NotesMode" },
{4,
BMP_DISPLAYMODE_SLIDE_SORTER,
STR_SLIDE_SORTER_MODE,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/doc/DocumentStylePoolManager.cxx | 72
1 file changed, 38 insertions(+), 34 deletions(-)
New commits:
commit 3d6fca942063fe5e398c3a09f9336dc5aa549138
Author: Yousuf Philips <philip...@hotmail.com>
Date: Fri Nov 17 19:02:20 2017 +0400
tdf#106988 Change default numbering list styles
Change-Id: I0b69c2cb7bbf169e208d7a3d15c93b4c3cf9716b
Reviewed-on: https://gerrit.libreoffice.org/37742
Reviewed-by: Yousuf Philips <philip...@hotmail.com>
Tested-by: Yousuf Philips <philip...@hotmail.com>
diff --git a/sw/source/core/doc/DocumentStylePoolManager.cxx
b/sw/source/core/doc/DocumentStylePoolManager.cxx
index b277007ef722..ffc1833d6e2c 100644
--- a/sw/source/core/doc/DocumentStylePoolManager.cxx
+++ b/sw/source/core/doc/DocumentStylePoolManager.cxx
@@ -1885,8 +1885,8 @@ SwNumRule* DocumentStylePoolManager::GetNumRuleFromPool(
sal_uInt16 nId )
static const sal_uInt16 aAbsSpace[ MAXLEVEL ] =
{
-// cm: 0,5 1,0 1,5 2,0 2,5 3,0 3,5 4,0 4,5 5,0
-283, 567, 850, 1134, 1417, 1701, 1984, 2268, 2551, 2835
+// cm: 0.7 cm intervals, with 1 cm = 567
+397, 794, 1191, 1588, 1985, 2381, 2778, 3175, 3572, 3969
};
const sal_uInt16* pArr = aAbsSpace;
@@ -1904,12 +1904,12 @@ SwNumRule*
DocumentStylePoolManager::GetNumRuleFromPool( sal_uInt16 nId )
{
if ( eNumberFormatPositionAndSpaceMode ==
SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
{
-aFormat.SetAbsLSpace( *pArr );
+aFormat.SetAbsLSpace( *pArr + 357 ); // 357 is indent of
0.63 cm
}
else if ( eNumberFormatPositionAndSpaceMode ==
SvxNumberFormat::LABEL_ALIGNMENT )
{
aFormat.SetListtabPos( *pArr );
-aFormat.SetIndentAt( *pArr );
+aFormat.SetIndentAt( *pArr + 357 );
}
pNewRule->Set( n, aFormat );
@@ -1921,25 +1921,27 @@ SwNumRule*
DocumentStylePoolManager::GetNumRuleFromPool( sal_uInt16 nId )
{
static const sal_uInt16 aAbsSpace[ MAXLEVEL ] =
{
-283, 283, 567, 709, // 0.50, 0.50, 1.00, 1.25
-850, 1021, 1304, 1474, // 1.50, 1.80, 2.30, 2.60
- 1588, 1758 // 2.80, 3.10
+397, 397, 397, 397, // 0.70 cm intervals
+397, 397, 397, 397,
+ 397, 397
};
const sal_uInt16* pArr = aAbsSpace;
SwNumFormat aFormat;
aFormat.SetPositionAndSpaceMode( eNumberFormatPositionAndSpaceMode
);
-aFormat.SetNumberingType(SVX_NUM_ARABIC);
+aFormat.SetNumberingType(SVX_NUM_CHARS_UPPER_LETTER);
aFormat.SetCharFormat( pNumCFormat );
+aFormat.SetStart( 1 );
aFormat.SetIncludeUpperLevels( 1 );
+aFormat.SetSuffix( "." );
if ( eNumberFormatPositionAndSpaceMode ==
SvxNumberFormat::LABEL_ALIGNMENT )
{
aFormat.SetLabelFollowedBy( SvxNumberFormat::LISTTAB );
}
-sal_uInt16 nSpace = 0;
+sal_uInt16 nSpace = 357; // indent of 0.63 cm
for (sal_uInt16 n = 0; n < MAXLEVEL; ++n)
{
if ( eNumberFormatPositionAndSpaceMode ==
SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
@@ -1954,7 +1956,6 @@ SwNumRule* DocumentStylePoolManager::GetNumRuleFromPool(
sal_uInt16 nId )
aFormat.SetFirstLineIndent( - pArr[ n ] );
}
-aFormat.SetStart( n+1 );
pNewRule->Set( n, aFormat );
}
}
@@ -1964,11 +1965,13 @@ SwNumRule*
DocumentStylePoolManager::GetNumRuleFromPool( sal_uInt16 nId )
SwNumFormat aFormat;
aFormat.SetPositionAndSpaceMode( eNumberFormatPositionAndSpaceMode
);
-aFormat.SetNumberingType(SVX_NUM_ARABIC);
+aFormat.SetNumberingType(SVX_NUM_CHARS_LOWER_LETTER);
aFormat.SetCharFormat( pNumCFormat );
+aFormat.SetStart( 1 );
aFormat.SetIncludeUpperLevels( 1 );
+aFormat.SetSuffix( "." );
-sal_uInt16 nOffs = GetMetricVal( CM_1 ) * 3;
+sal_uInt16 nOffs = 397; // 0.70 cm
if ( eNumberFormatPositionAndSpaceMode ==
SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
{
@@ -1984,16 +1987,15 @@ SwNumRule*
DocumentStylePoolManager::GetNumRuleFromPool( sal_uInt16 nId )
{
if ( eNumberFormatPositionAndSpaceMode ==
SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
{
-aFormat.SetAbsLSpace( (n+1) * nOffs );
+
[Libreoffice-commits] core.git: extras/source
extras/source/shellnew/soffice.odg |binary extras/source/shellnew/soffice.odp |binary extras/source/shellnew/soffice.ods |binary extras/source/shellnew/soffice.odt |binary 4 files changed New commits: commit 2a33c69b16cce539951a796d7afa45c13b097cf6 Author: Yousuf Philips <philip...@hotmail.com> Date: Fri Oct 20 23:50:36 2017 +0400 tdf#79754 updated windows shellnew template files the old template files were created with OOo 3.1 and use Arial and Times New Roman as default fonts, while these new files were created with LO 6.0 alpha use Liberation fonts as defaults Change-Id: I54c98f092af3f1eae31ea0b3458c0e91a1d1c074 Reviewed-on: https://gerrit.libreoffice.org/43625 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Yousuf Philips <philip...@hotmail.com> diff --git a/extras/source/shellnew/soffice.odg b/extras/source/shellnew/soffice.odg index 8b8c53978b63..0df6408db875 100644 Binary files a/extras/source/shellnew/soffice.odg and b/extras/source/shellnew/soffice.odg differ diff --git a/extras/source/shellnew/soffice.odp b/extras/source/shellnew/soffice.odp index 11be048b70ff..af729d5a3a11 100644 Binary files a/extras/source/shellnew/soffice.odp and b/extras/source/shellnew/soffice.odp differ diff --git a/extras/source/shellnew/soffice.ods b/extras/source/shellnew/soffice.ods index 6b80d548757c..2f3bcbc60319 100644 Binary files a/extras/source/shellnew/soffice.ods and b/extras/source/shellnew/soffice.ods differ diff --git a/extras/source/shellnew/soffice.odt b/extras/source/shellnew/soffice.odt index 6b0747507a6b..679cc6493cc6 100644 Binary files a/extras/source/shellnew/soffice.odt and b/extras/source/shellnew/soffice.odt differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/uiconfig
cui/uiconfig/ui/bitmaptabpage.ui | 56 ---
1 file changed, 35 insertions(+), 21 deletions(-)
New commits:
commit a8687041c46b3fe93a76faa0a4a65e7069ef5e9d
Author: Yousuf Philips <philip...@hotmail.com>
Date: Mon Nov 20 18:21:54 2017 +0400
tdf#113880 a11y: make bitmap tab of area tab accessible
Change-Id: Icfdb3f68bb0660b20ebe3f98e5e4fb8fcf3e54f1
Reviewed-on: https://gerrit.libreoffice.org/44897
Reviewed-by: Katarina Behrens <katarina.behr...@cib.de>
Tested-by: Yousuf Philips <philip...@hotmail.com>
diff --git a/cui/uiconfig/ui/bitmaptabpage.ui b/cui/uiconfig/ui/bitmaptabpage.ui
index a18167ed4f0d..2bac652692ea 100644
--- a/cui/uiconfig/ui/bitmaptabpage.ui
+++ b/cui/uiconfig/ui/bitmaptabpage.ui
@@ -1,8 +1,8 @@
-
+
-
+
True
False
@@ -62,8 +62,8 @@
True
False
-0
Bitmap
+0
@@ -107,8 +107,10 @@
True
False
-0
Style:
+True
+bitmapstyle
+0
False
@@ -152,8 +154,8 @@
True
False
-0
Size:
+0
False
@@ -170,7 +172,9 @@
True
False
-W:
+Width:
+True
+width:0%
False
@@ -194,7 +198,9 @@
True
False
-H:
+Height:
+True
+height:0%
False
@@ -253,8 +259,10 @@
True
False
-0
Position:
+True
+positionlb
+0
False
@@ -301,8 +309,8 @@
True
False
-0
Tiling Position:
+0
False
@@ -320,7 +328,9 @@
True
False
-X:
+X-Offset:
+True
+posoffx:0%
False
@@ -343,7 +353,9 @@
True
False
-Y:
+Y-Offset:
+True
+posoffy:0%
False
@@ -386,8 +398,10 @@
True
False
-0
Tiling Offset:
+True
+tileofflb
+0
False
@@ -487,16 +501,16 @@
vertical
-True
-False
-True
-True
-
-
-Example
-
-
+True
+False
+True
+True
+
+
+Example
+
+
True
True
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: officecfg/registry
officecfg/registry/data/org/openoffice/Office/Common.xcu | 34 +++ 1 file changed, 17 insertions(+), 17 deletions(-) New commits: commit 036a5177485b3c07b3297e4daae4c11331f4c8db Author: Yousuf Philips <philip...@hotmail.com> Date: Mon Nov 20 18:31:18 2017 +0400 Move position of Formula in File > New to similar to start center Change-Id: I3d5f81e444d2f48f2f2d90e474bd51dbd6a674b5 Reviewed-on: https://gerrit.libreoffice.org/44926 Reviewed-by: Yousuf Philips <philip...@hotmail.com> Tested-by: Yousuf Philips <philip...@hotmail.com> Reviewed-by: Heiko Tietze <tietze.he...@googlemail.com> diff --git a/officecfg/registry/data/org/openoffice/Office/Common.xcu b/officecfg/registry/data/org/openoffice/Office/Common.xcu index c7d198e38cd4..6b94ff9be853 100644 --- a/officecfg/registry/data/org/openoffice/Office/Common.xcu +++ b/officecfg/registry/data/org/openoffice/Office/Common.xcu @@ -155,7 +155,18 @@ _default - + + + private:factory/smath + + + F~ormula + + + _default + + + private:factory/sdatabase?Interactive @@ -169,7 +180,7 @@ private:image/3245 - + private:separator @@ -177,7 +188,7 @@ _default - + private:factory/swriter/web @@ -188,7 +199,7 @@ _default - + private:factory/swriter?slot=21053 @@ -199,7 +210,7 @@ _default - + private:factory/swriter/GlobalDocument @@ -210,7 +221,7 @@ _default - + private:separator @@ -218,17 +229,6 @@ _default - - - private:factory/smath - - - F~ormula - - - _default - - private:factory/swriter?slot=21051 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/uiconfig
cui/uiconfig/ui/paratabspage.ui |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit eb55a2cf1acf188b1ce640d7d01a573c5e8c45bb Author: Yousuf Philips <philip...@hotmail.com> Date: Mon Nov 20 14:29:34 2017 +0400 l10n: dont translate non-text character tab fill characters (2) Change-Id: Ib46cef900e681664e50b06c2e4a5af2b63a8f83f Reviewed-on: https://gerrit.libreoffice.org/44953 Reviewed-by: Gabor Kelemen <kelem...@ubuntu.com> Tested-by: Gabor Kelemen <kelem...@ubuntu.com> diff --git a/cui/uiconfig/ui/paratabspage.ui b/cui/uiconfig/ui/paratabspage.ui index 39bf028120d1..2b6083c7ffdf 100644 --- a/cui/uiconfig/ui/paratabspage.ui +++ b/cui/uiconfig/ui/paratabspage.ui @@ -331,7 +331,7 @@ -_ +_ True True False @@ -348,7 +348,7 @@ -_ +_ True True False @@ -365,7 +365,7 @@ -__ +__ True True False ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/uiconfig
cui/uiconfig/ui/charnamepage.ui | 16 1 file changed, 8 insertions(+), 8 deletions(-) New commits: commit cba0399132bb1d10054b9ade0c035dc49d8d3d2f Author: Yousuf Philips <philip...@hotmail.com> Date: Sat Nov 18 15:01:56 2017 +0400 tdf#113777 dont translate 'Family:' and 'Style:' strings these strings are replaced by strings in the code, so no need to translate them 4 additional times Change-Id: I6cd28b76367a950a2075cf5ef4ee021fe1a89fe0 Reviewed-on: https://gerrit.libreoffice.org/44761 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Gabor Kelemen <kelem...@ubuntu.com> Tested-by: Gabor Kelemen <kelem...@ubuntu.com> diff --git a/cui/uiconfig/ui/charnamepage.ui b/cui/uiconfig/ui/charnamepage.ui index 83041dcf7fca..94f11995c747 100644 --- a/cui/uiconfig/ui/charnamepage.ui +++ b/cui/uiconfig/ui/charnamepage.ui @@ -103,7 +103,7 @@ True False -Family: +Family: @@ -142,7 +142,7 @@ True False -Style: +Style: @@ -224,7 +224,7 @@ False True 0 -Family: +Family: True westfontnamelb-cjk @@ -239,7 +239,7 @@ False True 0 -Style: +Style: True weststylelb-cjk @@ -382,7 +382,7 @@ False True 0 -Family: +Family: True eastfontnamelb @@ -397,7 +397,7 @@ False True 0 -Style: +Style: True eaststylelb @@ -539,7 +539,7 @@ False True 0 -Family: +Family: True ctlfontnamelb @@ -554,7 +554,7 @@ False True 0 -Style: +Style: True ctlstylelb ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/inc
cui/inc/strings.hrc |8
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 49098daf5795499f6c34298d9476ab42125de51a
Author: Yousuf Philips <philip...@hotmail.com>
Date: Sat Nov 18 15:07:03 2017 +0400
tdf#113777 Add colon after family and style labels
Change-Id: I27a58b9c6f63275f3901d00e807588c2f4c278af
Reviewed-on: https://gerrit.libreoffice.org/44905
Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>
Tested-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>
diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index 5909ef647c74..f60f504bd451 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -321,10 +321,10 @@
#define RID_SVXSTR_TABLENC_("RID_SVXSTR_TABLE",
"Table")
#define RID_SVXSTR_DESC_LINEEND
NC_("RID_SVXSTR_DESC_LINEEND", "Please enter a name for the new arrowhead:")
#define RID_SVXSTR_CHARNAME_NOSTYLE
NC_("RID_SVXSTR_CHARNAME_NOSTYLE", "No %1")
-#define RID_SVXSTR_CHARNAME_FAMILY
NC_("RID_SVXSTR_CHARNAME_FAMILY", "Family")
-#define RID_SVXSTR_CHARNAME_FONT
NC_("RID_SVXSTR_CHARNAME_FONT", "Font")
-#define RID_SVXSTR_CHARNAME_STYLE
NC_("RID_SVXSTR_CHARNAME_STYLE", "Style")
-#define RID_SVXSTR_CHARNAME_TYPEFACE
NC_("RID_SVXSTR_CHARNAME_TYPEFACE", "Typeface")
+#define RID_SVXSTR_CHARNAME_FAMILY
NC_("RID_SVXSTR_CHARNAME_FAMILY", "Family:")
+#define RID_SVXSTR_CHARNAME_FONT
NC_("RID_SVXSTR_CHARNAME_FONT", "Font:")
+#define RID_SVXSTR_CHARNAME_STYLE
NC_("RID_SVXSTR_CHARNAME_STYLE", "Style:")
+#define RID_SVXSTR_CHARNAME_TYPEFACE
NC_("RID_SVXSTR_CHARNAME_TYPEFACE", "Typeface:")
#define RID_SVXSTR_CHARNAME_HIGHLIGHTING
NC_("RID_SVXSTR_CHARNAME_HIGHLIGHTING", "Highlight Color")
#define RID_SVXSTR_USE_REPLACE
NC_("RID_SVXSTR_USE_REPLACE", "Use replacement table")
#define RID_SVXSTR_CPTL_STT_WORD
NC_("RID_SVXSTR_CPTL_STT_WORD", "Correct TWo INitial CApitals")
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/svx
include/svx/strings.hrc |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit cda7d045d50558bd6f0ed2c3a612f7787ab10689
Author: Yousuf Philips <philip...@hotmail.com>
Date: Sat Nov 18 01:43:30 2017 +0400
Fix typo in bitmap preset 73
Change-Id: Ie7dfdf4c2ec1d5629a5bd69623074f306831a9d2
Reviewed-on: https://gerrit.libreoffice.org/44899
Reviewed-by: Julien Nabet <serval2...@yahoo.fr>
Tested-by: Jenkins <c...@libreoffice.org>
diff --git a/include/svx/strings.hrc b/include/svx/strings.hrc
index bed776d4ce1a..1b95233d2ca6 100644
--- a/include/svx/strings.hrc
+++ b/include/svx/strings.hrc
@@ -844,7 +844,7 @@
#define RID_SVXSTR_BMP70
NC_("RID_SVXSTR_BMP70", "Vertical")
#define RID_SVXSTR_BMP71
NC_("RID_SVXSTR_BMP71", "Horizontal")
#define RID_SVXSTR_BMP72
NC_("RID_SVXSTR_BMP72", "Downward Diagonal")
-#define RID_SVXSTR_BMP73
NC_("RID_SVXSTR_BMP72", "Upward Diagonal")
+#define RID_SVXSTR_BMP73
NC_("RID_SVXSTR_BMP73", "Upward Diagonal")
#define RID_SVXSTR_BMP74
NC_("RID_SVXSTR_BMP74", "Cross")
#define RID_SVXSTR_BMP75
NC_("RID_SVXSTR_BMP75", "Diagonal Cross")
#define RID_SVXSTR_DASH0
NC_("RID_SVXSTR_DASH0", "Ultrafine Dashed")
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: framework/uiconfig
framework/uiconfig/startmodule/menubar/menubar.xml | 13 +++-- 1 file changed, 11 insertions(+), 2 deletions(-) New commits: commit e8871a5ec9fc9b58ee688c9f1d9b3769ea57 Author: Yousuf Philips <philip...@hotmail.com> Date: Fri Nov 17 06:06:39 2017 +0400 Add templates menu and remove macro recording in start center Change-Id: I91c61047dcae3882f6f80279469963957c621138 Reviewed-on: https://gerrit.libreoffice.org/44838 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Yousuf Philips <philip...@hotmail.com> diff --git a/framework/uiconfig/startmodule/menubar/menubar.xml b/framework/uiconfig/startmodule/menubar/menubar.xml index 17deb149722d..63162f294566 100644 --- a/framework/uiconfig/startmodule/menubar/menubar.xml +++ b/framework/uiconfig/startmodule/menubar/menubar.xml @@ -25,8 +25,18 @@ + + + + + + - + + + + + @@ -35,7 +45,6 @@ - ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/uiconfig
sw/uiconfig/swriter/ui/numparapage.ui |1 +
1 file changed, 1 insertion(+)
New commits:
commit a3c981015da76dbda8626993da30c467a3e1c799
Author: Yousuf Philips <philip...@hotmail.com>
Date: Thu Nov 16 19:13:46 2017 +0400
tdf#113880 a11y: Link 'Numbering style:' label to drop-down list
Change-Id: I2e758d69f7193f611cfbba5d6189ceb858ecb81e
Reviewed-on: https://gerrit.libreoffice.org/44833
Reviewed-by: Yousuf Philips <philip...@hotmail.com>
Tested-by: Yousuf Philips <philip...@hotmail.com>
diff --git a/sw/uiconfig/swriter/ui/numparapage.ui
b/sw/uiconfig/swriter/ui/numparapage.ui
index 4969d202e024..3da2286cc78e 100644
--- a/sw/uiconfig/swriter/ui/numparapage.ui
+++ b/sw/uiconfig/swriter/ui/numparapage.ui
@@ -141,6 +141,7 @@
0
_Numbering style:
True
+comboLB_NUMBER_STYLE
False
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/uiconfig
cui/uiconfig/ui/paratabspage.ui |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit a2ed9435273d880e41b4d9196a37bfbf7f43d068 Author: Yousuf Philips <philip...@hotmail.com> Date: Fri Nov 17 10:27:13 2017 +0400 l10n: dont translate non-text character tab fill characters Change-Id: I529fe96d98e85119373e220ba8ddd7a4d4629a7c Reviewed-on: https://gerrit.libreoffice.org/44858 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Katarina Behrens <katarina.behr...@cib.de> diff --git a/cui/uiconfig/ui/paratabspage.ui b/cui/uiconfig/ui/paratabspage.ui index 56344137082e..39bf028120d1 100644 --- a/cui/uiconfig/ui/paratabspage.ui +++ b/cui/uiconfig/ui/paratabspage.ui @@ -331,7 +331,7 @@ -_ +_ True True False @@ -348,7 +348,7 @@ -_ +_ True True False @@ -365,7 +365,7 @@ -__ +__ True True False ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/ui/condformat/condformatdlgentry.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 7df058224a7cabb1cbfc8564ffe22a6844fb2a1f
Author: Yousuf Philips <philip...@hotmail.com>
Date: Fri Nov 10 18:54:47 2017 +0400
tdf#86508 Use Yellow and Green for 2 entry color scale
Change-Id: Icde57593fb2cb589465c574894ab10184702655a
Reviewed-on: https://gerrit.libreoffice.org/44603
Reviewed-by: Heiko Tietze <tietze.he...@googlemail.com>
Tested-by: Jenkins <c...@libreoffice.org>
diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx
b/sc/source/ui/condformat/condformatdlgentry.cxx
index b2a55fc3aca7..968576a8d2ba 100644
--- a/sc/source/ui/condformat/condformatdlgentry.cxx
+++ b/sc/source/ui/condformat/condformatdlgentry.cxx
@@ -786,8 +786,8 @@ void ScColorScale2FrmtEntry::Init()
{
maLbEntryTypeMin->SetSelectHdl( LINK( this, ScColorScale2FrmtEntry,
EntryTypeHdl ) );
maLbEntryTypeMax->SetSelectHdl( LINK( this, ScColorScale2FrmtEntry,
EntryTypeHdl ) );
-maLbColMin->SelectEntry(Color(COL_LIGHTRED));
-maLbColMax->SelectEntry(Color(COL_LIGHTBLUE));
+maLbColMin->SelectEntry(Color(0xFFF685)); // Light Yellow 2
+maLbColMax->SelectEntry(Color(0x65C295)); // Light Green 2
}
ScFormatEntry* ScColorScale2FrmtEntry::createColorscaleEntry() const
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: download.lst external/more_fonts Makefile.fetch Repository.mk
Makefile.fetch |1 Repository.mk |1 download.lst|2 + external/more_fonts/ExternalPackage_noto.mk | 45 external/more_fonts/Module_more_fonts.mk|2 + external/more_fonts/UnpackedTarball_noto.mk | 14 6 files changed, 65 insertions(+) New commits: commit b97e713e76c88141d26f6e19a74db80a105cb911 Author: Yousuf Philips <philip...@hotmail.com> Date: Tue Oct 31 21:48:27 2017 +0400 tdf#103080 Add Noto fonts into default installation Includes the regular, italic, bold and bold italic for * Noto Sans, Noto Serif Includes the regular and bold for * Noto Kufi Arabic, Noto Naskh Arabic * Noto Sans Armenian, Noto Serif Armenian * Noto Sans Georgian, Noto Serif Georgian * Noto Sans Hebrew, Noto Serif Hebrew * Noto Sans Lao, Noto Serif Lao Includes the regular and bold for * Noto Mono * Noto Sans Lisu Change-Id: I2a423b7cac031e2e899df22ad902bd09d1da250d Reviewed-on: https://gerrit.libreoffice.org/44128 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Yousuf Philips <philip...@hotmail.com> diff --git a/Makefile.fetch b/Makefile.fetch index 17780cb2fd4c..3944ac75c7b2 100644 --- a/Makefile.fetch +++ b/Makefile.fetch @@ -178,6 +178,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk $(SRCDIR)/download.lst $(S $(call fetch_Optional,MORE_FONTS,FONT_SOURCECODE_TARBALL) \ $(call fetch_Optional,MORE_FONTS,FONT_SOURCESANS_TARBALL) \ $(call fetch_Optional,MORE_FONTS,FONT_EMOJIONE_COLOR_TARBALL) \ + $(call fetch_Optional,MORE_FONTS,FONT_NOTO_TARBALL) \ $(call fetch_Optional,MSPUB,MSPUB_TARBALL) \ $(call fetch_Optional,MWAW,MWAW_TARBALL) \ $(call fetch_Optional,MYSQL_CONNECTOR_CPP,MYSQL_CONNECTOR_CPP_TARBALL) \ diff --git a/Repository.mk b/Repository.mk index 7fbc1343ccf6..77608e4790af 100644 --- a/Repository.mk +++ b/Repository.mk @@ -954,6 +954,7 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo_fonts,\ fonts_liberation \ fonts_liberation_narrow \ fonts_libertineg \ + fonts_noto \ fonts_opensans \ fonts_ptserif \ fonts_sourcecode \ diff --git a/download.lst b/download.lst index 80f5c2cc5650..8dc80d3af2a6 100644 --- a/download.lst +++ b/download.lst @@ -72,6 +72,8 @@ export FONT_SOURCESANS_SHA256SUM := e7bc9a1fec787a529e49f5a26b93dcdcf41506449dfc export FONT_SOURCESANS_TARBALL := edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz export FONT_EMOJIONE_COLOR_SHA256SUM := d1a08f7c10589f22740231017694af0a7a270760c8dec33d8d1c038e2be0a0c7 export FONT_EMOJIONE_COLOR_TARBALL := EmojiOneColor-SVGinOT-1.3.tar.gz +export FONT_NOTO_SHA256SUM := 8a269926a3c88dd14b124b19138b54408938a45ea6e60db65073469f45ae6ac8 +export FONT_NOTO_TARBALL := noto-fonts-20170306.tar.gz export FREEHAND_SHA256SUM := 0e422d1564a6dbf22a9af598535425271e583514c0f7ba7d9091676420de34ac export FREEHAND_TARBALL := libfreehand-0.1.2.tar.xz export FREETYPE_SHA256SUM := e5435f02e02d2b87bb8e4efdcaa14b1f78c9cf3ab1ed80f94b6382fb6acc7d78 diff --git a/external/more_fonts/ExternalPackage_noto.mk b/external/more_fonts/ExternalPackage_noto.mk new file mode 100644 index ..adbb88fd4f6d --- /dev/null +++ b/external/more_fonts/ExternalPackage_noto.mk @@ -0,0 +1,45 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# 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/. +# + +$(eval $(call gb_ExternalPackage_ExternalPackage,fonts_noto,font_noto)) + +$(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_noto,$(LIBO_SHARE_FOLDER)/fonts/truetype,\ + NotoKufiArabic-Bold.ttf \ + NotoKufiArabic-Regular.ttf \ + NotoMono-Regular.ttf \ + NotoNaskhArabic-Bold.ttf \ + NotoNaskhArabic-Regular.ttf \ + NotoSansArmenian-Bold.ttf \ + NotoSansArmenian-Regular.ttf \ + NotoSans-Bold.ttf \ + NotoSans-BoldItalic.ttf \ + NotoSansGeorgian-Bold.ttf \ + NotoSansGeorgian-Regular.ttf \ + NotoSansHebrew-Bold.ttf \ + NotoSansHebrew-Regular.ttf \ + NotoSans-Italic.ttf \ + NotoSansLao-Bold.ttf \ + NotoSansLao-Regular.ttf \ + NotoSansLisu-Regular.ttf \ + NotoSans-Regular.ttf \ + NotoSerifArmenian-Bold.ttf \ + NotoSerifArmenian-Regular.ttf \ + NotoSerif-Bold.ttf \ + NotoSerif-BoldItalic.ttf \ + NotoSerifGeorgian-Bold.ttf \ + NotoSerifGeorgian-Regular.ttf \ + NotoSerifHebrew-Bold.ttf \ +
[Libreoffice-commits] core.git: include/editeng sw/source
include/editeng/borderline.hxx |1 + sw/source/core/doc/tblafmt.cxx | 37 +++-- 2 files changed, 4 insertions(+), 34 deletions(-) New commits: commit 0ba318b895c164750dc3c7bac6948b04b606f2b8 Author: Yousuf Philips <philip...@hotmail.com> Date: Mon Nov 6 18:14:55 2017 +0400 tdf#107554 New default table style Change-Id: I7811ac11c0a92f85698fc5cd43016d85f4661b98 Reviewed-on: https://gerrit.libreoffice.org/44363 Reviewed-by: Heiko Tietze <tietze.he...@googlemail.com> Tested-by: Heiko Tietze <tietze.he...@googlemail.com> diff --git a/include/editeng/borderline.hxx b/include/editeng/borderline.hxx index b873852fc7a0..848c4308ce33 100644 --- a/include/editeng/borderline.hxx +++ b/include/editeng/borderline.hxx @@ -35,6 +35,7 @@ #define DEF_LINE_WIDTH_380 #define DEF_LINE_WIDTH_4100 #define DEF_LINE_WIDTH_510 +#define DEF_LINE_WIDTH_65 // 0.25pt // Abstracts over values from css::table::BorderLineStyle diff --git a/sw/source/core/doc/tblafmt.cxx b/sw/source/core/doc/tblafmt.cxx index 8235c52f77dd..d8932eb774e5 100644 --- a/sw/source/core/doc/tblafmt.cxx +++ b/sw/source/core/doc/tblafmt.cxx @@ -1234,44 +1234,13 @@ SwTableAutoFormatTable::SwTableAutoFormatTable() std::unique_ptr pNew(new SwTableAutoFormat( SwStyleNameMapper::GetUIName(RES_POOLTABSTYLE_DEFAULT, OUString(; -SwBoxAutoFormat aNew; - sal_uInt8 i; -Color aColor( COL_BLUE ); -SvxBrushItem aBrushItem( aColor, RES_BACKGROUND ); -aNew.SetBackground( aBrushItem ); -aNew.SetColor( SvxColorItem(Color( COL_WHITE ), RES_CHRATR_COLOR) ); - -for( i = 0; i < 4; ++i ) -pNew->SetBoxFormat( aNew, i ); - -// 70% gray -aBrushItem.SetColor( RGB_COLORDATA( 0x4d, 0x4d, 0x4d ) ); -aNew.SetBackground( aBrushItem ); -for( i = 4; i <= 12; i += 4 ) -pNew->SetBoxFormat( aNew, i ); - -// 20% gray -aBrushItem.SetColor( RGB_COLORDATA( 0xcc, 0xcc, 0xcc ) ); -aNew.SetBackground( aBrushItem ); -aColor.SetColor( COL_BLACK ); -aNew.SetColor( SvxColorItem( aColor, RES_CHRATR_COLOR) ); -for( i = 7; i <= 15; i += 4 ) -pNew->SetBoxFormat( aNew, i ); -for( i = 13; i <= 14; ++i ) -pNew->SetBoxFormat( aNew, i ); - -aBrushItem.SetColor( Color( COL_WHITE ) ); -aNew.SetBackground( aBrushItem ); -for( i = 5; i <= 6; ++i ) -pNew->SetBoxFormat( aNew, i ); -for( i = 9; i <= 10; ++i ) -pNew->SetBoxFormat( aNew, i ); - +Color aColor( COL_BLACK ); SvxBoxItem aBox( RES_BOX ); + aBox.SetAllDistances(55); -SvxBorderLine aLn( , DEF_LINE_WIDTH_0 ); +SvxBorderLine aLn( , DEF_LINE_WIDTH_5 ); aBox.SetLine( , SvxBoxItemLine::LEFT ); aBox.SetLine( , SvxBoxItemLine::BOTTOM ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
