core.git: 2 commits - extras/source
extras/source/templates/presnt/Blueprint_Plans/Pictures/1058001F99D2A38C014B254B.png |binary extras/source/templates/presnt/Blueprint_Plans/Pictures/133C026D847ACE982C6E20B6.png |binary extras/source/templates/presnt/Blueprint_Plans/Pictures/1201050002D0F25E20EA381A5EBD.png |binary extras/source/templates/presnt/Yellow_Idea/Pictures/1201001A001A21D7EADBA56038F4.png |binary extras/source/templates/presnt/Yellow_Idea/Pictures/120100410019BACEF928CB2A84CB.png |binary extras/source/templates/presnt/Yellow_Idea/Pictures/1201004D008BE35F31AC2914377D.png |binary extras/source/templates/presnt/Yellow_Idea/Pictures/1201004E00192EFFFDEF12FDB2A8.png |binary extras/source/templates/presnt/Yellow_Idea/Pictures/1201009E00BD075AA48B79110C47.png |binary 8 files changed New commits: commit 7cfd3da36b54301fd51189282b39c71efd6bb894 Author: Laurent Balland AuthorDate: Sun Dec 10 12:01:43 2023 +0100 Commit: Laurent Balland CommitDate: Sun Dec 10 17:18:32 2023 +0100 tdf#158250 Blueprint Plans template: update images Contribution from Jérôme Bouat Replace pictures with grey level and indexed colours Change-Id: I5e253af65529d45b3c9ed2e30f6e2f018cbe03e7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160532 Tested-by: Jenkins Reviewed-by: Laurent Balland diff --git a/extras/source/templates/presnt/Blueprint_Plans/Pictures/1058001F99D2A38C014B254B.png b/extras/source/templates/presnt/Blueprint_Plans/Pictures/1058001F99D2A38C014B254B.png index 51f498c0f76f..a7264148dc75 100644 Binary files a/extras/source/templates/presnt/Blueprint_Plans/Pictures/1058001F99D2A38C014B254B.png and b/extras/source/templates/presnt/Blueprint_Plans/Pictures/1058001F99D2A38C014B254B.png differ diff --git a/extras/source/templates/presnt/Blueprint_Plans/Pictures/133C026D847ACE982C6E20B6.png b/extras/source/templates/presnt/Blueprint_Plans/Pictures/133C026D847ACE982C6E20B6.png index df9e0e0ccd29..084ab4241606 100644 Binary files a/extras/source/templates/presnt/Blueprint_Plans/Pictures/133C026D847ACE982C6E20B6.png and b/extras/source/templates/presnt/Blueprint_Plans/Pictures/133C026D847ACE982C6E20B6.png differ diff --git a/extras/source/templates/presnt/Blueprint_Plans/Pictures/1201050002D0F25E20EA381A5EBD.png b/extras/source/templates/presnt/Blueprint_Plans/Pictures/1201050002D0F25E20EA381A5EBD.png index fa93caf0..4dc77fde421f 100644 Binary files a/extras/source/templates/presnt/Blueprint_Plans/Pictures/1201050002D0F25E20EA381A5EBD.png and b/extras/source/templates/presnt/Blueprint_Plans/Pictures/1201050002D0F25E20EA381A5EBD.png differ commit 9168109f39a587a14c65b5b22103c909d6a6054e Author: Laurent Balland AuthorDate: Sun Dec 10 12:22:12 2023 +0100 Commit: Laurent Balland CommitDate: Sun Dec 10 17:18:19 2023 +0100 tdf#158250 Yellow Idea template: replace pictures Contribution from Jérôme Bouat Replace pictures with grey level Change-Id: I933b20ad7b06d60e8039caaf8ce777bb52ce4225 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160534 Tested-by: Jenkins Reviewed-by: Laurent Balland diff --git a/extras/source/templates/presnt/Yellow_Idea/Pictures/1201001A001A21D7EADBA56038F4.png b/extras/source/templates/presnt/Yellow_Idea/Pictures/1201001A001A21D7EADBA56038F4.png index c6e585c3d8b6..ee4897033c32 100644 Binary files a/extras/source/templates/presnt/Yellow_Idea/Pictures/1201001A001A21D7EADBA56038F4.png and b/extras/source/templates/presnt/Yellow_Idea/Pictures/1201001A001A21D7EADBA56038F4.png differ diff --git a/extras/source/templates/presnt/Yellow_Idea/Pictures/120100410019BACEF928CB2A84CB.png b/extras/source/templates/presnt/Yellow_Idea/Pictures/120100410019BACEF928CB2A84CB.png index 028f13522c81..369336dc2f6c 100644 Binary files a/extras/source/templates/presnt/Yellow_Idea/Pictures/120100410019BACEF928CB2A84CB.png and b/extras/source/templates/presnt/Yellow_Idea/Pictures/120100410019BACEF928CB2A84CB.png differ diff --git a/extras/source/templates/presnt/Yellow_Idea/Pictures/1201004D008BE35F31AC2914377D.png b/extras/source/templates/presnt/Yellow_Idea/Pictures/1201004D008BE35F31AC2914377D.png index 6482e91b58dd..c7b5270e0046 100644 Binary files a/extras/source/templates/presnt/Yellow_Idea/Pictures/1201004D008BE35F31AC2914377D.png and b/extras/source/templates/presnt/Yellow_Idea/Pictures/1201004D008BE35F31AC2914377D.png differ diff --git a/extras/source/templates/presnt/Yellow_Idea/Pictures/1201004E00192EFFFDEF12FDB2A8.png b/extr
core.git: 2 commits - extras/source
extras/source/templates/presnt/Grey_Elegant/Pictures/12010019001945D72F17575B71B4.png |binary extras/source/templates/presnt/Grey_Elegant/Pictures/1201001900194F0EE08BB7018624.png |binary extras/source/templates/presnt/Grey_Elegant/Pictures/12010019001967D610D5BD5B9486.png |binary extras/source/templates/presnt/Grey_Elegant/Pictures/120100190019B19ADF33FD67D860.png |binary extras/source/templates/presnt/Grey_Elegant/Pictures/120100190019CA03B954885E470D.png |binary extras/source/templates/presnt/Grey_Elegant/Pictures/12010330026455AC9786240DB2F8.png |binary extras/source/templates/presnt/Piano/Pictures/13540120266623530F1969D0.png |binary extras/source/templates/presnt/Vintage/Pictures/1058001F99D2A38C014B254B.png |binary 8 files changed New commits: commit b91d7649a6c2be19439b9c042ee9520c32e621e4 Author: Laurent Balland AuthorDate: Sun Dec 10 12:29:09 2023 +0100 Commit: Laurent Balland CommitDate: Sun Dec 10 17:18:06 2023 +0100 tdf#158250 Grey Elegant template: replace pictures Contribution from Jérôme Bouat Replace pictures with grey level Change-Id: If56958228085a77a61e867622a7a1a48e127745c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160535 Tested-by: Jenkins Reviewed-by: Laurent Balland diff --git a/extras/source/templates/presnt/Grey_Elegant/Pictures/12010019001945D72F17575B71B4.png b/extras/source/templates/presnt/Grey_Elegant/Pictures/12010019001945D72F17575B71B4.png index ac31c1f71c18..5e7b03557265 100644 Binary files a/extras/source/templates/presnt/Grey_Elegant/Pictures/12010019001945D72F17575B71B4.png and b/extras/source/templates/presnt/Grey_Elegant/Pictures/12010019001945D72F17575B71B4.png differ diff --git a/extras/source/templates/presnt/Grey_Elegant/Pictures/1201001900194F0EE08BB7018624.png b/extras/source/templates/presnt/Grey_Elegant/Pictures/1201001900194F0EE08BB7018624.png index 16cbe3dd99f7..22d7ddc628c9 100644 Binary files a/extras/source/templates/presnt/Grey_Elegant/Pictures/1201001900194F0EE08BB7018624.png and b/extras/source/templates/presnt/Grey_Elegant/Pictures/1201001900194F0EE08BB7018624.png differ diff --git a/extras/source/templates/presnt/Grey_Elegant/Pictures/12010019001967D610D5BD5B9486.png b/extras/source/templates/presnt/Grey_Elegant/Pictures/12010019001967D610D5BD5B9486.png index 1a3676b65be3..690dd493eb8d 100644 Binary files a/extras/source/templates/presnt/Grey_Elegant/Pictures/12010019001967D610D5BD5B9486.png and b/extras/source/templates/presnt/Grey_Elegant/Pictures/12010019001967D610D5BD5B9486.png differ diff --git a/extras/source/templates/presnt/Grey_Elegant/Pictures/120100190019B19ADF33FD67D860.png b/extras/source/templates/presnt/Grey_Elegant/Pictures/120100190019B19ADF33FD67D860.png index afa1d1541ec9..fee4dbad2003 100644 Binary files a/extras/source/templates/presnt/Grey_Elegant/Pictures/120100190019B19ADF33FD67D860.png and b/extras/source/templates/presnt/Grey_Elegant/Pictures/120100190019B19ADF33FD67D860.png differ diff --git a/extras/source/templates/presnt/Grey_Elegant/Pictures/120100190019CA03B954885E470D.png b/extras/source/templates/presnt/Grey_Elegant/Pictures/120100190019CA03B954885E470D.png index 3a6a13e37ffb..d974e642e2be 100644 Binary files a/extras/source/templates/presnt/Grey_Elegant/Pictures/120100190019CA03B954885E470D.png and b/extras/source/templates/presnt/Grey_Elegant/Pictures/120100190019CA03B954885E470D.png differ diff --git a/extras/source/templates/presnt/Grey_Elegant/Pictures/12010330026455AC9786240DB2F8.png b/extras/source/templates/presnt/Grey_Elegant/Pictures/12010330026455AC9786240DB2F8.png index 52664f895960..71dd76d1f922 100644 Binary files a/extras/source/templates/presnt/Grey_Elegant/Pictures/12010330026455AC9786240DB2F8.png and b/extras/source/templates/presnt/Grey_Elegant/Pictures/12010330026455AC9786240DB2F8.png differ commit 6fda99d874d73f93b51e483e29b85b69333acef9 Author: Laurent Balland AuthorDate: Sun Dec 10 12:16:18 2023 +0100 Commit: Laurent Balland CommitDate: Sun Dec 10 17:17:52 2023 +0100 tdf#158250 Vivid, Piano templates: replace pictures Contribution from Jérôme Bouat Replace pictures with grey level Change-Id: Ib8522871404261e81c25b50ac1ee073058e0dce5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160533 Tested-by: Jenkins Reviewed-by: Laurent Balland diff --git a/extras/source/templates/presnt/Piano/Pictures/13540120266623530F1969D0.png b/extras/source/templates/presnt/Piano/Pictures/13540120266623
[Libreoffice-commits] core.git: 2 commits - extras/source
extras/source/templates/presnt/Metropolis/styles.xml | 54 -- extras/source/templates/presnt/Nature_Illustration/styles.xml | 54 -- 2 files changed, 108 deletions(-) New commits: commit f1f8fd8455aee3cb07108696856c6026d453f372 Author: Laurent Balland AuthorDate: Sun Dec 3 14:30:10 2023 +0100 Commit: Laurent Balland CommitDate: Mon Dec 4 18:50:13 2023 +0100 Nature Illustration template: remove unused styles These old styles are used in the template and is no more in use in LO. So they remain untranslated when changing UI language. Change-Id: I5a4b0c6914eb97eb2448a24909ded294c9c0ddf9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160264 Tested-by: Jenkins Tested-by: Heiko Tietze Reviewed-by: Heiko Tietze diff --git a/extras/source/templates/presnt/Nature_Illustration/styles.xml b/extras/source/templates/presnt/Nature_Illustration/styles.xml index 200ec815019b..8c384e2ce424 100644 --- a/extras/source/templates/presnt/Nature_Illustration/styles.xml +++ b/extras/source/templates/presnt/Nature_Illustration/styles.xml @@ -65,63 +65,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - commit d103f4afddd6360c3e09fde3cbe7c3f720ac7f65 Author: Laurent Balland AuthorDate: Sun Dec 3 14:19:42 2023 +0100 Commit: Laurent Balland CommitDate: Mon Dec 4 18:50:00 2023 +0100 Metropolis Impress template: remove unused styles These old styles are used in the template and is no more in use in LO. So they remain untranslated when changing UI language. Change-Id: If86e6573c03af481fcb43ffc2521bcdd3bd9e584 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160263 Tested-by: Jenkins Tested-by: Heiko Tietze Reviewed-by: Heiko Tietze diff --git a/extras/source/templates/presnt/Metropolis/styles.xml b/extras/source/templates/presnt/Metropolis/styles.xml index cada57042c56..6a7a14efca6c 100644 --- a/extras/source/templates/presnt/Metropolis/styles.xml +++ b/extras/source/templates/presnt/Metropolis/styles.xml @@ -62,63 +62,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
[Libreoffice-commits] core.git: 2 commits - extras/source sw/source
extras/source/autocorr/lang/ro/DocumentList.xml | 9882 +++- sw/source/core/swg/SwXMLTextBlocks1.cxx |2 2 files changed, 9797 insertions(+), 87 deletions(-) New commits: commit 5bd1fec8db76a608f05d95dfeb92e49940864697 Author: Caolán McNamara AuthorDate: Sat Dec 31 20:31:31 2022 + Commit: Caolán McNamara CommitDate: Sat Dec 31 21:31:03 2022 + Related: tdf#150687 pretty-print Romanian autocorrect file for human readability Change-Id: I371a23ebdd3ab19e9d3092fca4c811068294a256 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144888 Tested-by: Jenkins Reviewed-by: Caolán McNamara diff --git a/extras/source/autocorr/lang/ro/DocumentList.xml b/extras/source/autocorr/lang/ro/DocumentList.xml index f277437d8c57..b319c6337cfb 100644 --- a/extras/source/autocorr/lang/ro/DocumentList.xml +++ b/extras/source/autocorr/lang/ro/DocumentList.xml @@ -1,89 +1,9799 @@ - -http://openoffice.org/2001/block-list";>
[Libreoffice-commits] core.git: 2 commits - extras/source
extras/source/templates/presnt/Focus/styles.xml | 14 +++--- extras/source/templates/presnt/Inspiration/styles.xml | 11 ++- 2 files changed, 13 insertions(+), 12 deletions(-) New commits: commit 38160bc630567aa5d1384528516983ec17866edb Author: Laurent BP AuthorDate: Thu Sep 8 09:21:02 2022 +0200 Commit: Adolfo Jayme Barrientos CommitDate: Wed Sep 14 11:36:55 2022 +0200 tdf#135060 Modify Inspiration template When using template as master page, styles Accent_x are not imported This patch add direct formating to keep format when using template as master page. Change-Id: Iec0e87de4fa9f6cead971a97690bc17b62526a72 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139631 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos diff --git a/extras/source/templates/presnt/Inspiration/styles.xml b/extras/source/templates/presnt/Inspiration/styles.xml index 5f0ee10d8015..1060504377dc 100644 --- a/extras/source/templates/presnt/Inspiration/styles.xml +++ b/extras/source/templates/presnt/Inspiration/styles.xml @@ -384,8 +384,8 @@ - - + + @@ -396,8 +396,8 @@ - - + + @@ -406,7 +406,8 @@ - + + commit a4226f8afc6c2e6026581b41f2149024f04cdf04 Author: Laurent BP AuthorDate: Sun Sep 11 13:35:50 2022 +0200 Commit: Adolfo Jayme Barrientos CommitDate: Wed Sep 14 11:36:35 2022 +0200 tdf#135060 Modify Focus template When using template as master page, styles Accent_x are not imported This patch add direct formating to keep format when using template as master page. Correct attribute error for asian font size Change-Id: I6d1c8be24a156bce72a09604ab013fc0800b9f80 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139767 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos diff --git a/extras/source/templates/presnt/Focus/styles.xml b/extras/source/templates/presnt/Focus/styles.xml index 447ef721b2e4..4d631baec3c1 100644 --- a/extras/source/templates/presnt/Focus/styles.xml +++ b/extras/source/templates/presnt/Focus/styles.xml @@ -778,7 +778,7 @@ - + @@ -934,22 +934,22 @@ - + - + - + - + - + - +
[Libreoffice-commits] core.git: 2 commits - extras/source svtools/source
extras/source/templates/draw/bpmn/content.xml |4 ++-- svtools/source/misc/sampletext.cxx| 10 +- 2 files changed, 7 insertions(+), 7 deletions(-) New commits: commit 70eb16ed8781264ac883bc799459ada9545103c7 Author: Andrea Gelmini AuthorDate: Fri Oct 23 17:32:18 2020 +0200 Commit: Julien Nabet CommitDate: Sun Oct 25 09:56:20 2020 +0100 Fix typo It passed "make check" on Linux Change-Id: I52796ff1e64a125d84e83261d0193e9f37e76a15 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104738 Tested-by: Jenkins Reviewed-by: Andreas Kainz diff --git a/extras/source/templates/draw/bpmn/content.xml b/extras/source/templates/draw/bpmn/content.xml index 5bff85ecd219..7cf9fd2141ca 100644 --- a/extras/source/templates/draw/bpmn/content.xml +++ b/extras/source/templates/draw/bpmn/content.xml @@ -846,7 +846,7 @@ - Direct formating + Direct formatting BPMN gallery items use 11px font size to fit well in writer and draw. Bold borders have 0,10 mm line width. @@ -923,7 +923,7 @@ BPMN gallery - gallery items store the styles as direct formating style, so when you move an gallery item into the page click Format → Clear Direct Formating and the gallery items use the defined styles. + gallery items store the styles as direct formatting style, so when you move an gallery item into the page click Format → Clear Direct Formatting and the gallery items use the defined styles. commit bb23417ce4d5e757f497c07ddc24f87d91f60310 Author: Julien Nabet AuthorDate: Sat Oct 24 11:56:03 2020 +0200 Commit: Julien Nabet CommitDate: Sun Oct 25 09:56:06 2020 +0100 Replace list by vector in svtools/sampletext Change-Id: I5ccff96e6369ff602e049dbaab1612574b729a4b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104750 Tested-by: Jenkins Reviewed-by: DaeHyun Sung Reviewed-by: Julien Nabet diff --git a/svtools/source/misc/sampletext.cxx b/svtools/source/misc/sampletext.cxx index bf3b128b68fe..1cd48482bc62 100644 --- a/svtools/source/misc/sampletext.cxx +++ b/svtools/source/misc/sampletext.cxx @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include // This should only be used when a commonly used font incorrectly declares its @@ -1216,7 +1216,7 @@ namespace } } -const std::map> distCjkMap = +const std::map> distCjkMap = { { USCRIPT_KOREAN, { " KR", "Korean"} }, // Korean { USCRIPT_JAPANESE, {" JP", "Japanese"} } , // Japanese @@ -1273,10 +1273,10 @@ namespace // for the last time, Check the ISO code strings or font specific strings const OUString &rName = rDevice.GetFont().GetFamilyName(); -std::map>::const_iterator distCjkMapIt; +std::map>::const_iterator distCjkMapIt; for (distCjkMapIt = distCjkMap.begin(); distCjkMapIt != distCjkMap.end(); ++distCjkMapIt) { -std::list cjkCodeList = distCjkMapIt->second; -std::list::const_iterator cjkPtr; +std::vector cjkCodeList = distCjkMapIt->second; +std::vector::const_iterator cjkPtr; for (cjkPtr = cjkCodeList.begin(); cjkPtr != cjkCodeList.end(); ++cjkPtr) { if (rName.indexOf(*cjkPtr) > 0) { return distCjkMapIt->first; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - extras/source
extras/source/templates/presnt/Progress/Thumbnails/thumbnail.png |binary extras/source/templates/presnt/Progress/content.xml | 57 +- extras/source/templates/presnt/Progress/styles.xml | 209 ++- extras/source/templates/presnt/Sunset/Thumbnails/thumbnail.png |binary extras/source/templates/presnt/Sunset/content.xml|2 extras/source/templates/presnt/Sunset/styles.xml | 263 ++ 6 files changed, 301 insertions(+), 230 deletions(-) New commits: commit 4907531966880f2bb4bb14b1c159865909000842 Author: Laurent BP AuthorDate: Sun May 10 20:16:34 2020 +0200 Commit: Adolfo Jayme Barrientos CommitDate: Wed May 13 22:49:08 2020 +0200 tdf#132771 Update Progress Impress template * Update preview with Lorem 16:9 * remove language and country tags in styles.xml * add Asian and complex tags in content.xml and styles.xml * remove useless text page number in styles.xml * add one slide base on missing master page in content.xml * remove useless skewX tag Change-Id: Ib9326bb7968263c1eaeba9cc8fbc7b063c9599cf Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93936 Tested-by: Jenkins Reviewed-by: andreas_kainz diff --git a/extras/source/templates/presnt/Progress/Thumbnails/thumbnail.png b/extras/source/templates/presnt/Progress/Thumbnails/thumbnail.png index 9b256a660a97..7c6c70b170c5 100644 Binary files a/extras/source/templates/presnt/Progress/Thumbnails/thumbnail.png and b/extras/source/templates/presnt/Progress/Thumbnails/thumbnail.png differ diff --git a/extras/source/templates/presnt/Progress/content.xml b/extras/source/templates/presnt/Progress/content.xml index d6b309fcdb04..d789ca2281c8 100644 --- a/extras/source/templates/presnt/Progress/content.xml +++ b/extras/source/templates/presnt/Progress/content.xml @@ -45,13 +45,22 @@ - + + + + + + + + + + - + - + @@ -62,14 +71,11 @@ - + - - - @@ -115,7 +121,6 @@ - Your footer here. @@ -127,9 +132,7 @@ - - - + @@ -150,7 +153,7 @@ - + @@ -169,12 +172,12 @@ - + - + - + @@ -183,9 +186,31 @@ + + + + + + + + + + + + + + + + + + + + + + - + diff --git a/extras/source/templates/presnt/Progress/styles.xml b/extras/source/templates/presnt/Progress/styles.xml index a092881a1bcb..16e18e03cf98 100644 --- a/extras/source/templates/presnt/Progress/styles.xml +++ b/extras/source/templates/presnt/Progress/styles.xml @@ -20,7 +20,7 @@ - + @@ -84,41 +84,41 @@ - + - + - + - + - + - + - + - + @@ -167,9 +167,6 @@ - - - @@ -238,40 +235,27 @@ - + - - + + - - + + - - + + - - - - - - - - - - - - - - - - - - + + + + + @@ -366,7 +350,7 @@ - + @@ -430,40 +414,26 @@ - + - - + - - + + - - + + - - - - - - - - - - - - - - - - - - + + + + + @@ -560,7 +530,7 @@ - + @@ -624,40 +594,26 @@ - + - - + -
[Libreoffice-commits] core.git: 2 commits - extras/source
extras/source/templates/presnt/BrightBlue/Thumbnails/thumbnail.png |binary extras/source/templates/presnt/BrightBlue/styles.xml | 53 +-- extras/source/templates/presnt/Focus/Thumbnails/thumbnail.png |binary extras/source/templates/presnt/Focus/content.xml |2 extras/source/templates/presnt/Focus/styles.xml| 166 +++--- 5 files changed, 78 insertions(+), 143 deletions(-) New commits: commit 4344cbeec7a4215e62ca553f260967a5732e7081 Author: Laurent BP AuthorDate: Fri May 8 15:57:52 2020 +0200 Commit: Adolfo Jayme Barrientos CommitDate: Sun May 10 16:00:49 2020 +0200 tdf#132771 Update BrightBlue Impress template * Update preview with Lorem 16:9 * remove language and country tags in styles.xml * add Asian and complex tags in styles.xml * remove useless text page number in German in styles.xml Change-Id: Iea9cbd8f47c802a8cc3ef2b012bad3bc6ef56a95 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93745 Tested-by: Jenkins Reviewed-by: andreas_kainz diff --git a/extras/source/templates/presnt/BrightBlue/Thumbnails/thumbnail.png b/extras/source/templates/presnt/BrightBlue/Thumbnails/thumbnail.png index 3927b487f9fe..77227e431f73 100644 Binary files a/extras/source/templates/presnt/BrightBlue/Thumbnails/thumbnail.png and b/extras/source/templates/presnt/BrightBlue/Thumbnails/thumbnail.png differ diff --git a/extras/source/templates/presnt/BrightBlue/styles.xml b/extras/source/templates/presnt/BrightBlue/styles.xml index ea392cba27b5..4fe58893079f 100644 --- a/extras/source/templates/presnt/BrightBlue/styles.xml +++ b/extras/source/templates/presnt/BrightBlue/styles.xml @@ -17,7 +17,7 @@ - + @@ -81,41 +81,41 @@ - + - + - + - + - + - + - + - + @@ -177,7 +177,7 @@ - + @@ -234,7 +234,7 @@ - + @@ -242,28 +242,15 @@ - + - - - - - - - - - - - - - - - - - + + + + @@ -358,7 +345,7 @@ - + @@ -564,7 +551,7 @@ -+ @@ -610,7 +597,7 @@ - + @@ -652,7 +639,7 @@ - + commit 382cb25bc16372da853f36c25f7ebba41f88124c Author: Laurent BP AuthorDate: Fri May 8 17:05:59 2020 +0200 Commit: Adolfo Jayme Barrientos CommitDate: Sun May 10 16:00:35 2020 +0200 tdf#132771 Update Focus Impress template * Update preview with Lorem 16:9 * remove language and country tags in styles.xml * add Asian and complex tags in content.xml and styles.xml * remove useless text page number in English in styles.xml * increase some really tiny font sizes Change-Id: I884a8ed3a1ee231a2e79b12fd68492672628cd6c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93772 Tested-by: Jenkins Reviewed-by: andreas_kainz diff --git a/extras/source/templates/presnt/Focus/Thumbnails/thumbnail.png b/extras/source/templates/presnt/Focus/Thumbnails/thumbnail.png index 62386413514e..1e895274ddff 100644 Binary files a/extras/source/templates/presnt/Focus/Thumbnails/thumbnail.png and b/extras/source/templates/presnt/Focus/Thumbnails/thumbnail.png differ diff --git a/extras/source/templates/presnt/Focus/content.xml b/extras/source/templates/presnt/Focus/content.xml index 639b29ad9b25..b3bbcfeb6ae4 100644 --- a/extras/source/templates/presnt/Focus/content.xml +++ b/extras/source/templates/presnt/Focus/content.xml @@ -57,7 +57,7 @@ - + diff --git a/extras/source/templates/presnt/Focus/styles.xml b/extras/source/templates/presnt/Focus/styles.xml index 88787e34ddec..447ef721b2e4 100644 --- a/extras/source/templates/presnt/Focus/styles.xml +++ b/extras/source/templates/presnt/Focus/styles.xml @@ -22,7 +22,7 @@ - + @@ -84,30 +84,30 @@ - + - + - + - + - +
[Libreoffice-commits] core.git: 2 commits - extras/source
extras/source/templates/presnt/Pencil/Thumbnails/thumbnail.png |binary extras/source/templates/presnt/Pencil/content.xml | 25 extras/source/templates/presnt/Pencil/styles.xml | 327 + extras/source/templates/presnt/Piano/Thumbnails/thumbnail.png |binary extras/source/templates/presnt/Piano/content.xml | 28 extras/source/templates/presnt/Piano/styles.xml| 362 +- 6 files changed, 436 insertions(+), 306 deletions(-) New commits: commit 155648d602e84e7626b55c71e9b76140303e7432 Author: andreas kainz AuthorDate: Thu Apr 30 16:22:11 2020 +0200 Commit: andreas_kainz CommitDate: Thu Apr 30 18:06:18 2020 +0200 tdf#132138 Update piano impress template Change-Id: I77795dbc87d8835d5609dd12ed33ad029dd309a7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93218 Tested-by: Jenkins Reviewed-by: andreas_kainz diff --git a/extras/source/templates/presnt/Piano/Thumbnails/thumbnail.png b/extras/source/templates/presnt/Piano/Thumbnails/thumbnail.png index 4bb2fa0b6204..4d35bef892d7 100644 Binary files a/extras/source/templates/presnt/Piano/Thumbnails/thumbnail.png and b/extras/source/templates/presnt/Piano/Thumbnails/thumbnail.png differ diff --git a/extras/source/templates/presnt/Piano/content.xml b/extras/source/templates/presnt/Piano/content.xml index f7384641ab9d..5b84e2793643 100644 --- a/extras/source/templates/presnt/Piano/content.xml +++ b/extras/source/templates/presnt/Piano/content.xml @@ -1,5 +1,5 @@ -http://www.w3.org/1999/xlink"; xmlns:dc="http://purl.org/dc/elements/1.1/"; xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML"; xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" x mlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:ooo="http://openoffice.org/2004/office"; xmlns:ooow="http://openoffice.org/2004/writer"; xmlns:oooc="http://openoffice.org/2004/calc"; xmlns:dom="http://www.w3.org/2001/xml-events"; xmlns:xforms="http://www.w3.org/2002/xforms"; xmlns:xsd="http://www.w3.org/2001/XMLSchema"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:smil="urn:oasis:names:tc:opendocument:xmlns:smil-compatible:1.0" xmlns:anim="urn:oasis:names:tc:opendocument:xmlns:animation:1.0" xmlns:rpt="http://openoffice.org/2005/report"; xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xhtml="http://www.w3.org/1999/xhtml"; xmlns:grddl="http://www.w3.org/2003/g/data-view#"; xmlns:officeooo="http://openoffice.org/2009/office"; xmlns:tableooo="http://openoffice.org/2009/table"; xmlns:drawooo="http://openoffice.org/2010/draw"; xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:loext="urn:org:documentfoundation: names:experimental:office:xmlns:loext:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2"> +http://openoffice.org/2004/office"; xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink"; xmlns:dc="http://purl.org/dc/elements/1.1/"; xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:rpt="http://openoffice.org/2005/report"; xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:ooow="http://openoffice.org/2004/writer"; xmlns:oooc="http://openoffice.org/2004/calc"; x mlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:tableooo="http://openoffice.org/2009/table"; xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:drawooo="http://openoffice.org/2010/draw"; xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML"; xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:dom="http://www.w3.org/2001/xml-events"; xmlns:xforms="http://www.w3.org/2002/xforms"; xmlns:xsd="ht
[Libreoffice-commits] core.git: 2 commits - extras/source sw/qa
extras/source/palettes/standard.soh| 29 ++--- sw/qa/extras/ooxmlexport/ooxmlexport10.cxx |3 +- sw/qa/extras/ooxmlexport/ooxmlexport7.cxx | 16 +-- sw/qa/extras/ooxmlexport/ooxmllinks.cxx|2 - sw/qa/extras/rtfexport/rtfexport2.cxx | 18 - sw/qa/extras/rtfexport/rtfexport5.cxx |9 -- sw/qa/extras/ww8export/ww8export.cxx | 16 +-- sw/qa/inc/swmodeltestbase.hxx | 40 + 8 files changed, 86 insertions(+), 47 deletions(-) New commits: commit 191b43536a2bee034ef9902b49ca5fbcdbddec53 Author: Miklos Vajna AuthorDate: Fri Mar 6 09:42:04 2020 +0100 Commit: Miklos Vajna CommitDate: Fri Mar 6 10:19:20 2020 +0100 SwModelTestBase: speed up export tests Export tests used to do the following steps: 1) Import 2) Verify 3) Discard state 4) Import 5) Export 6) Import 7) Verify Assuming that the cost of 2), 3) and 7) is almost zero, that leaves us with 4 filter() invocations for every such "export" test. But it seems to me, we can save one filter() call if we do it this way: 1) Import 2) Verify 3) Export 4) Import 5) Verify The only trick is that verify should perform its verification by only reading the document model. So adapt tests which mutated the doc model: paste tests should be import tests, the rest only did mutation by accident. A 'make check' is 88 seconds faster for me with this, using -j8. (~12 minutes of CPU time saved.) Change-Id: I40db8a9b9adaa99020acd718ba4ec3fd9bee3fb8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90077 Reviewed-by: Miklos Vajna Tested-by: Jenkins diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx index 363584c78ea0..75403a4deeb9 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx @@ -1074,8 +1074,9 @@ DECLARE_OOXMLEXPORT_TEST(testTdf95777, "tdf95777.docx") // This must not fail on open } -DECLARE_OOXMLEXPORT_TEST(testTdf94374, "hello.docx") +CPPUNIT_TEST_FIXTURE(Test, testTdf94374) { +load(mpTestDocumentPath, "hello.docx"); uno::Reference xTextDocument(mxComponent, uno::UNO_QUERY); uno::Reference xText = xTextDocument->getText(); uno::Reference xEnd = xText->getEnd(); diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx index 721f1292e8d5..a7f4b5e4eacf 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx @@ -883,20 +883,20 @@ DECLARE_OOXMLEXPORT_TEST(testTextVerticalAdjustment, "tdf36117_verticalAdjustmen SwDoc* pDoc = pTextDoc->GetDocShell()->GetDoc(); CPPUNIT_ASSERT(pDoc); -SwPageDesc &Desc = pDoc->GetPageDesc( 0 ); -drawing::TextVerticalAdjust nVA = Desc.GetVerticalAdjustment(); +SwPageDesc* pDesc = &pDoc->GetPageDesc( 0 ); +drawing::TextVerticalAdjust nVA = pDesc->GetVerticalAdjustment(); CPPUNIT_ASSERT_EQUAL( drawing::TextVerticalAdjust_CENTER, nVA ); -Desc = pDoc->GetPageDesc( 1 ); -nVA = Desc.GetVerticalAdjustment(); +pDesc = &pDoc->GetPageDesc( 1 ); +nVA = pDesc->GetVerticalAdjustment(); CPPUNIT_ASSERT_EQUAL( drawing::TextVerticalAdjust_TOP, nVA ); -Desc = pDoc->GetPageDesc( 2 ); -nVA = Desc.GetVerticalAdjustment(); +pDesc = &pDoc->GetPageDesc( 2 ); +nVA = pDesc->GetVerticalAdjustment(); CPPUNIT_ASSERT_EQUAL( drawing::TextVerticalAdjust_BOTTOM, nVA ); -Desc = pTextDoc->GetDocShell()->GetDoc()->GetPageDesc( 3 ); -nVA = Desc.GetVerticalAdjustment(); +pDesc = &pDoc->GetPageDesc( 3 ); +nVA = pDesc->GetVerticalAdjustment(); CPPUNIT_ASSERT_EQUAL( drawing::TextVerticalAdjust_BLOCK, nVA ); } diff --git a/sw/qa/extras/ooxmlexport/ooxmllinks.cxx b/sw/qa/extras/ooxmlexport/ooxmllinks.cxx index d559242d505c..ba61d24e55c6 100644 --- a/sw/qa/extras/ooxmlexport/ooxmllinks.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmllinks.cxx @@ -70,7 +70,7 @@ aOpt.SetSaveRelFSys(true); \ CPPUNIT_ASSERT(aOpt.IsSaveRelFSys()); \ } \ -executeImportExportImportTest(FileName); \ +executeLoadReloadVerify(FileName); \ } \ void verify() override; \ }; \ diff --git a/sw/qa/extras/rt
[Libreoffice-commits] core.git: 2 commits - extras/source sc/uiconfig sd/uiconfig solenv/bin solenv/sanitizers svtools/source sw/uiconfig
extras/source/glade/libreoffice-catalog.xml.in | 12 sc/uiconfig/scalc/ui/notebookbar_groups.ui | 11 --- sd/uiconfig/simpress/ui/notebookbar_groups.ui | 11 --- solenv/bin/native-code.py |1 - solenv/sanitizers/ui/modules/scalc.suppr |1 - solenv/sanitizers/ui/modules/simpress.suppr|1 - solenv/sanitizers/ui/modules/swriter.suppr |1 - svtools/source/control/ctrlbox.cxx | 14 -- sw/uiconfig/swriter/ui/notebookbar_groups.ui | 11 --- 9 files changed, 63 deletions(-) New commits: commit b1095ac103db4fc62611233e6fed2054ff0d6817 Author: Caolán McNamara AuthorDate: Thu Feb 6 14:16:33 2020 + Commit: Caolán McNamara CommitDate: Thu Feb 6 18:16:25 2020 +0100 no FontNameBox exists in any .ui file anymore Change-Id: I9ca3a4da0cd9bcc2b528d5c761a55efd2a4de2f9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88106 Tested-by: Jenkins Reviewed-by: Caolán McNamara diff --git a/extras/source/glade/libreoffice-catalog.xml.in b/extras/source/glade/libreoffice-catalog.xml.in index 7d3700349e61..0be42ad51e65 100644 --- a/extras/source/glade/libreoffice-catalog.xml.in +++ b/extras/source/glade/libreoffice-catalog.xml.in @@ -42,18 +42,6 @@ - - - - -GParamBoolean - - - - - diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py index 747335aa6436..71b37c987e59 100755 --- a/solenv/bin/native-code.py +++ b/solenv/bin/native-code.py @@ -498,7 +498,6 @@ custom_widgets = [ 'DataTreeListBox', 'DropdownBox', 'EmojiView', -'FontNameBox', 'IndexBox', 'IndexBox', 'ManagedMenuButton', diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx index 5324c98ee964..3b79d98abd52 100644 --- a/svtools/source/control/ctrlbox.cxx +++ b/svtools/source/control/ctrlbox.cxx @@ -337,20 +337,6 @@ FontNameBox::FontNameBox( vcl::Window* pParent, WinBits nWinStyle ) : InitFontMRUEntriesFile(); } -extern "C" SAL_DLLPUBLIC_EXPORT void makeFontNameBox(VclPtr & rRet, const VclPtr & pParent, VclBuilder::stringmap & rMap) -{ - static_assert(std::is_same_v, - decltype(makeFontNameBox)>); -bool bDropdown = BuilderUtils::extractDropdown(rMap); -WinBits nWinBits = WB_LEFT|WB_VCENTER|WB_3DLOOK|WB_TABSTOP; -if (bDropdown) -nWinBits |= WB_DROPDOWN; -VclPtrInstance pListBox(pParent, nWinBits); -if (bDropdown) -pListBox->EnableAutoSize(true); -rRet = pListBox; -} - FontNameBox::~FontNameBox() { disposeOnce(); commit de665c0afc4a63837494d3044303561690d91ad5 Author: Caolán McNamara AuthorDate: Thu Feb 6 14:14:38 2020 + Commit: Caolán McNamara CommitDate: Thu Feb 6 18:16:10 2020 +0100 the svtlo-FontNameBox entries are hidden and nothing interacts with them so they can be removed from the notebook .ui without effect Change-Id: I85e46ee8539e83776c4ce107a715d9eeccf6222c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88105 Tested-by: Jenkins Reviewed-by: Caolán McNamara diff --git a/sc/uiconfig/scalc/ui/notebookbar_groups.ui b/sc/uiconfig/scalc/ui/notebookbar_groups.ui index 0accdeca0c04..05454f188bb3 100644 --- a/sc/uiconfig/scalc/ui/notebookbar_groups.ui +++ b/sc/uiconfig/scalc/ui/notebookbar_groups.ui @@ -816,17 +816,6 @@ 1 - - -36 -False - - -False -True -2 - - True diff --git a/sd/uiconfig/simpress/ui/notebookbar_groups.ui b/sd/uiconfig/simpress/ui/notebookbar_groups.ui index fc4a75d874d0..93bb6aabd00b 100644 --- a/sd/uiconfig/simpress/ui/notebookbar_groups.ui +++ b/sd/uiconfig/simpress/ui/notebookbar_groups.ui @@ -749,17 +749,6 @@ 0 - - -36 -False - - -False -True -1 - - True diff --git a/solenv/sanitizers/ui/modules/scalc.suppr b/solenv/sanitizers/ui/modules/scalc.suppr index 6556a7d6b2e7..be99b8f97249 100644 --- a/solenv/sanitizers/ui/modules/scalc.suppr +++ b/solenv/sanitizers/ui/modules/scalc.suppr @@
[Libreoffice-commits] core.git: 2 commits - extras/source sd/Library_sd.mk sd/source sd/uiconfig sd/UIConfig_simpress.mk solenv/clang-format solenv/sanitizers
extras/source/glade/libreoffice-catalog.xml.in |3 sd/Library_sd.mk |1 sd/UIConfig_simpress.mk|1 sd/source/ui/animations/SlideTransitionBox.cxx | 87 sd/source/ui/animations/SlideTransitionPane.cxx| 25 - sd/source/ui/inc/SlideTransitionPane.hxx |7 sd/uiconfig/simpress/ui/slidetransitionspanelhorizontal.ui | 264 - solenv/clang-format/blacklist |1 solenv/sanitizers/ui/modules/simpress.suppr|6 9 files changed, 1 insertion(+), 394 deletions(-) New commits: commit c1ed2a821234b02529bf949214d0dd26aaa4330c Author: Caolán McNamara AuthorDate: Sat Dec 21 12:49:24 2019 + Commit: Caolán McNamara CommitDate: Sat Dec 21 15:39:32 2019 +0100 so horizontal SlideTransitionPane is also unused since... commit 57ca02a7486090f1dd63977bb8fb351f9bf9a7f3 Date: Wed Apr 18 00:04:09 2018 +0200 NB Impress tabbed toolbar big update Change-Id: Icfe7201caea8337dca051c188c071809e8eb0670 Reviewed-on: https://gerrit.libreoffice.org/85655 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/sd/UIConfig_simpress.mk b/sd/UIConfig_simpress.mk index aecdecff39ed..c5526412d883 100644 --- a/sd/UIConfig_simpress.mk +++ b/sd/UIConfig_simpress.mk @@ -149,7 +149,6 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/simpress,\ sd/uiconfig/simpress/ui/slidecontextmenu \ sd/uiconfig/simpress/ui/slidedesigndialog \ sd/uiconfig/simpress/ui/slidetransitionspanel \ - sd/uiconfig/simpress/ui/slidetransitionspanelhorizontal \ sd/uiconfig/simpress/ui/tabledesignpanel \ sd/uiconfig/simpress/ui/templatedialog \ )) diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx index 18da6d42a124..abe300766881 100644 --- a/sd/source/ui/animations/SlideTransitionPane.cxx +++ b/sd/source/ui/animations/SlideTransitionPane.cxx @@ -405,26 +405,6 @@ SlideTransitionPane::SlideTransitionPane( mbHasSelection( false ), mbUpdatingControls( false ), mbIsMainViewChangePending( false ), -mbHorizontalLayout( false ), -maLateInitTimer() -{ -Initialize(pDoc); -} - -SlideTransitionPane::SlideTransitionPane( -Window * pParent, -ViewShellBase & rBase, -SdDrawDocument* pDoc, -const css::uno::Reference& rxFrame, -bool /*bHorizontalLayout*/ ) : -PanelLayout( pParent, "SlideTransitionsPanel", "modules/simpress/ui/slidetransitionspanelhorizontal.ui", rxFrame, true ), - -mrBase( rBase ), -mpDrawDoc( pDoc ), -mbHasSelection( false ), -mbUpdatingControls( false ), -mbIsMainViewChangePending( false ), -mbHorizontalLayout( true ), maLateInitTimer() { Initialize(pDoc); @@ -535,10 +515,7 @@ void SlideTransitionPane::DataChanged (const DataChangedEvent&) void SlideTransitionPane::UpdateLook() { -if( mbHorizontalLayout ) -SetBackground(Wallpaper()); -else - SetBackground(::sfx2::sidebar::Theme::GetWallpaper(::sfx2::sidebar::Theme::Paint_PanelBackground)); + SetBackground(::sfx2::sidebar::Theme::GetWallpaper(::sfx2::sidebar::Theme::Paint_PanelBackground)); } void SlideTransitionPane::onSelectionChanged() diff --git a/sd/source/ui/inc/SlideTransitionPane.hxx b/sd/source/ui/inc/SlideTransitionPane.hxx index 7b0d52a9cff3..1b506b39bb48 100644 --- a/sd/source/ui/inc/SlideTransitionPane.hxx +++ b/sd/source/ui/inc/SlideTransitionPane.hxx @@ -53,12 +53,6 @@ public: ViewShellBase & rBase, SdDrawDocument* pDoc, const css::uno::Reference& rxFrame ); -explicit SlideTransitionPane( -Window * pParent, -ViewShellBase & rBase, -SdDrawDocument* pDoc, -const css::uno::Reference& rxFrame, -bool bHorizontalLayout ); virtual ~SlideTransitionPane() override; virtual void dispose() override; @@ -130,7 +124,6 @@ private: bool mbHasSelection; bool mbUpdatingControls; bool mbIsMainViewChangePending; -bool const mbHorizontalLayout; std::vector maSoundList; mutable OUString maCurrentSoundFile; diff --git a/sd/uiconfig/simpress/ui/slidetransitionspanelhorizontal.ui b/sd/uiconfig/simpress/ui/slidetransitionspanelhorizontal.ui deleted file mode 100644 index fbf0c161fd75.. --- a/sd/uiconfig/simpress/ui/slidetransitionspanelhorizontal.ui +++ /dev/null @@ -1,264 +0,0 @@ - - - - - -True -False -True -vertical - - -True -False -True -12 - - -True -False - - -500 -75 -True -False -True
[Libreoffice-commits] core.git: 2 commits - extras/source include/svx solenv/bin solenv/sanitizers svx/source svx/uiconfig
extras/source/glade/libreoffice-catalog.xml.in|4 include/svx/spacinglistbox.hxx| 11 - solenv/bin/native-code.py |1 solenv/sanitizers/ui/svx.suppr|8 svx/source/dialog/spacinglistbox.cxx | 135 +++-- svx/source/sidebar/shadow/ShadowPropertyPanel.cxx | 217 ++ svx/source/sidebar/shadow/ShadowPropertyPanel.hxx | 42 ++-- svx/uiconfig/ui/sidebarshadow.ui | 47 +++- 8 files changed, 193 insertions(+), 272 deletions(-) New commits: commit 07754d010257b36a6f695879f10a839ccf166058 Author: Caolán McNamara AuthorDate: Thu Dec 19 15:48:02 2019 + Commit: Caolán McNamara CommitDate: Fri Dec 20 09:54:14 2019 +0100 weld ShadowPropertyPanel Change-Id: I5ffd5881955726823b0e4c6f347e9a1e1767b640 Reviewed-on: https://gerrit.libreoffice.org/85535 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/solenv/sanitizers/ui/svx.suppr b/solenv/sanitizers/ui/svx.suppr index 5b323a5f23e8..8aee20b117aa 100644 --- a/solenv/sanitizers/ui/svx.suppr +++ b/solenv/sanitizers/ui/svx.suppr @@ -64,15 +64,9 @@ svx/uiconfig/ui/sidebararea.ui://GtkLabel[@id='filllabel'] orphan-label svx/uiconfig/ui/sidebararea.ui://svxlo-SvxFillAttrBox[@id='fillattr'] missing-label-for svx/uiconfig/ui/sidebararea.ui://svxlo-SvxFillTypeBox[@id='fillstyle'] missing-label-for svx/uiconfig/ui/sidebararea.ui://GtkLabel[@id='transparencylabel'] orphan-label -svx/uiconfig/ui/sidebarshadow.ui://GtkLabel[@id='angle'] orphan-label -svx/uiconfig/ui/sidebarshadow.ui://GtkLabel[@id='distance'] orphan-label -svx/uiconfig/ui/sidebarshadow.ui://VclComboBoxNumeric[@id='LB_ANGLE:0degrees'] no-labelled-by -svx/uiconfig/ui/sidebarshadow.ui://VclComboBoxNumeric[@id='LB_DISTANCE:0pt'] no-labelled-by svx/uiconfig/ui/sidebarshadow.ui://GtkLabel[@id='transparency_label'] orphan-label -svx/uiconfig/ui/sidebarshadow.ui://GtkSpinButton[@id='FIELD_TRANSPARENCY:0%'] no-labelled-by +svx/uiconfig/ui/sidebarshadow.ui://GtkSpinButton[@id='FIELD_TRANSPARENCY'] no-labelled-by svx/uiconfig/ui/sidebarshadow.ui://GtkScale[@id='transparency_slider'] no-labelled-by -svx/uiconfig/ui/sidebarshadow.ui://GtkLabel[@id='color'] orphan-label -svx/uiconfig/ui/sidebarshadow.ui://svxcorelo-SvxColorListBox[@id='LB_SHADOW_COLOR'] no-labelled-by svx/uiconfig/ui/sidebargraphic.ui://GtkSpinButton[@id='setbrightness:%'] missing-label-for svx/uiconfig/ui/sidebargraphic.ui://GtkSpinButton[@id='setbrightness:%'] labelled-by-and-mnemonic svx/uiconfig/ui/sidebargraphic.ui://GtkSpinButton[@id='setcontrast:%'] missing-label-for diff --git a/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx b/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx index 8c93ee2708d0..b641101a6f79 100644 --- a/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx +++ b/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx @@ -34,42 +34,13 @@ using namespace css; using namespace css::uno; -namespace { - -sal_uInt32 ParseText(OUString const & sTmp) -{ -if (sTmp.isEmpty()) -return 0; -sal_Unicode nChar = sTmp[0]; -if( nChar == '-' ) -{ -if (sTmp.getLength() < 2) -return 0; -nChar = sTmp[1]; -} - -if( (nChar < '0') || (nChar > '9') ) -return 0; - -const LocaleDataWrapper& rLocaleWrapper( Application::GetSettings().GetLocaleDataWrapper() ); - -rtl_math_ConversionStatus eStatus; -double fTmp = rLocaleWrapper.stringToDouble( sTmp, false, &eStatus, nullptr); -if (eStatus != rtl_math_ConversionStatus_Ok) -return 0; - -return fTmp; -} - -} - namespace svx { namespace sidebar { ShadowPropertyPanel::ShadowPropertyPanel( vcl::Window* pParent, const uno::Reference& rxFrame, SfxBindings* pBindings) -: PanelLayout(pParent, "ShadowPropertyPanel", "svx/ui/sidebarshadow.ui", rxFrame), +: PanelLayout(pParent, "ShadowPropertyPanel", "svx/ui/sidebarshadow.ui", rxFrame, true), maShadowController(SID_ATTR_FILL_SHADOW, *pBindings, *this), maShadowTransController(SID_ATTR_SHADOW_TRANSPARENCE, *pBindings, *this), maShadowColorController(SID_ATTR_SHADOW_COLOR, *pBindings, *this), @@ -78,19 +49,18 @@ ShadowPropertyPanel::ShadowPropertyPanel( mpBindings(pBindings), nX(0), nY(0), -nXY(0) +nXY(0), +mxShowShadow(m_xBuilder->weld_check_button("SHOW_SHADOW")), +mxShadowDistance(m_xBuilder->weld_metric_spin_button("LB_DISTANCE", FieldUnit::POINT)), +mxLBShadowColor(new ColorListBox(m_xBuilder->weld_menu_button("LB_SHADOW_COLOR"), GetFrameWeld())), +mxShadowAngle(m_xBuilder->weld_combo_box("LB_ANGLE")), +mxFTAngle(m_xBuilder->weld_label("angle")), +mxFTDistance(m_xBuilder->weld_label("distance")), +mxFTTransparency(m_xBuilder->weld_label("transparency_label")), +mxFTColor(m_xBuilder->weld_label("color")), +mxShadowTransSlider(m_xBuilder->weld_
[Libreoffice-commits] core.git: 2 commits - extras/source include/svx solenv/bin svx/source sw/source sw/uiconfig
extras/source/glade/libreoffice-catalog.xml.in |4 include/svx/samecontentlistbox.hxx |9 - solenv/bin/native-code.py |1 svx/source/dialog/samecontentlistbox.cxx | 41 +- sw/source/uibase/sidebar/PageFooterPanel.hxx |3 sw/source/uibase/sidebar/PageFormatPanel.hxx |2 sw/source/uibase/sidebar/PageHeaderPanel.hxx |3 sw/source/uibase/sidebar/WrapPropertyPanel.cxx | 165 - sw/source/uibase/sidebar/WrapPropertyPanel.hxx | 35 ++--- sw/uiconfig/swriter/ui/sidebarwrap.ui | 29 ++-- 10 files changed, 127 insertions(+), 165 deletions(-) New commits: commit 3e0c33395c50aa58baac678067024cd23698a3d6 Author: Caolán McNamara AuthorDate: Thu Dec 19 15:12:55 2019 + Commit: Caolán McNamara CommitDate: Thu Dec 19 22:11:45 2019 +0100 weld WrapPropertyPanel Change-Id: I8ff662fbdcd4defc3d04795e70d95df31b154e20 Reviewed-on: https://gerrit.libreoffice.org/85532 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/sw/source/uibase/sidebar/PageFooterPanel.hxx b/sw/source/uibase/sidebar/PageFooterPanel.hxx index 00a536a38fb5..d855af799854 100644 --- a/sw/source/uibase/sidebar/PageFooterPanel.hxx +++ b/sw/source/uibase/sidebar/PageFooterPanel.hxx @@ -28,9 +28,6 @@ #include -#include -#include -#include #include #include #include diff --git a/sw/source/uibase/sidebar/PageFormatPanel.hxx b/sw/source/uibase/sidebar/PageFormatPanel.hxx index 206d478fe403..db7311593c3f 100644 --- a/sw/source/uibase/sidebar/PageFormatPanel.hxx +++ b/sw/source/uibase/sidebar/PageFormatPanel.hxx @@ -29,8 +29,6 @@ #include #include -#include -#include #include #include #include diff --git a/sw/source/uibase/sidebar/PageHeaderPanel.hxx b/sw/source/uibase/sidebar/PageHeaderPanel.hxx index bed71f71b043..60132d536080 100644 --- a/sw/source/uibase/sidebar/PageHeaderPanel.hxx +++ b/sw/source/uibase/sidebar/PageHeaderPanel.hxx @@ -28,9 +28,6 @@ #include -#include -#include -#include #include #include #include diff --git a/sw/source/uibase/sidebar/WrapPropertyPanel.cxx b/sw/source/uibase/sidebar/WrapPropertyPanel.cxx index b9d01096a1f7..f87afb188735 100644 --- a/sw/source/uibase/sidebar/WrapPropertyPanel.cxx +++ b/sw/source/uibase/sidebar/WrapPropertyPanel.cxx @@ -21,6 +21,7 @@ #include #include +#include #include #include #include @@ -29,7 +30,6 @@ #include #include #include -#include #include #include #include @@ -69,7 +69,7 @@ WrapPropertyPanel::WrapPropertyPanel( vcl::Window* pParent, const css::uno::Reference< css::frame::XFrame >& rxFrame, SfxBindings* pBindings ) -: PanelLayout(pParent, "WrapPropertyPanel", "modules/swriter/ui/sidebarwrap.ui", rxFrame) +: PanelLayout(pParent, "WrapPropertyPanel", "modules/swriter/ui/sidebarwrap.ui", rxFrame, true) , mxFrame( rxFrame ) , mpBindings(pBindings) // spacing @@ -89,19 +89,19 @@ WrapPropertyPanel::WrapPropertyPanel( , maSwEnableContourControl(FN_FRAME_WRAP_CONTOUR, *pBindings, *this) , maSwLRSpacingControl(SID_ATTR_LRSPACE, *pBindings, *this) , maSwULSpacingControl(SID_ATTR_ULSPACE, *pBindings, *this) +, mxRBNoWrap(m_xBuilder->weld_radio_button("buttonnone")) +, mxRBWrapLeft(m_xBuilder->weld_radio_button("buttonbefore")) +, mxRBWrapRight(m_xBuilder->weld_radio_button("buttonafter")) +, mxRBWrapParallel(m_xBuilder->weld_radio_button("buttonparallel")) +, mxRBWrapThrough(m_xBuilder->weld_radio_button("buttonthrough")) +, mxRBIdealWrap(m_xBuilder->weld_radio_button("buttonoptimal")) +, mxEditContour(m_xBuilder->weld_button("editcontour")) +, mxEnableContour(m_xBuilder->weld_check_button("enablecontour")) +, mxSpacingLB(m_xBuilder->weld_combo_box("spacingLB")) +, mxCustomEntry(m_xBuilder->weld_label("customlabel")) { -get(mpRBNoWrap, "buttonnone"); -get(mpRBWrapLeft, "buttonbefore"); -get(mpRBWrapRight, "buttonafter"); -get(mpRBWrapParallel, "buttonparallel"); -get(mpRBWrapThrough, "buttonthrough"); -get(mpRBIdealWrap, "buttonoptimal"); -get(mpEnableContour, "enablecontour"); -get(mpEditContour, "editcontour"); -get(mpSpacingLB, "spacingLB"); FieldUnit eMetric = ::GetDfltMetric(false); -mpSpacingLB->Init(IsInch(eMetric) ? SpacingType::SPACING_INCH : SpacingType::SPACING_CM); -get(mpCustomEntry, "customlabel"); +SpacingListBox::Fill(IsInch(eMetric) ? SpacingType::SPACING_INCH : SpacingType::SPACING_CM, *mxSpacingLB); Initialize(); } @@ -113,16 +113,16 @@ WrapPropertyPanel::~WrapPropertyPanel() void WrapPropertyPanel::dispose() { -mpRBNoWrap.clear(); -mpRBWrapLeft.clear(); -mpRBWrapRight.clear(); -mpRBWrapParallel.clear(); -mpRBWrapThrough.clear(); -mpRBIdealWrap.clear(); -mpEnableContour.clear(); -mpEditContour.clear(); -mpSpacingLB.clear(); -mpCus
[Libreoffice-commits] core.git: 2 commits - extras/source
extras/source/templates/presnt/BrightBlue/styles.xml | 58 +-- extras/source/templates/presnt/Classy_Red/content.xml |2 extras/source/templates/presnt/Classy_Red/styles.xml | 94 +- 3 files changed, 76 insertions(+), 78 deletions(-) New commits: commit e0f06e60c6e8958bc508d24585189043888e0eb9 Author: Laurent BP AuthorDate: Mon Oct 14 21:10:19 2019 +0200 Commit: Laurent BP CommitDate: Thu Nov 14 19:16:18 2019 +0100 tdf#114746 Restore asian and complex tags in Classy_Red template Manually add tags to fix size, bold and italic: style:font-size-asian style:font-size-complex style:font-style-asian style:font-style-complex style:font-weight-asian style:font-weight-complex Change-Id: Ib878ce99908b1e42822204a468c011739e3b62ff Reviewed-on: https://gerrit.libreoffice.org/80802 Tested-by: Jenkins Reviewed-by: Laurent BP diff --git a/extras/source/templates/presnt/Classy_Red/content.xml b/extras/source/templates/presnt/Classy_Red/content.xml index 8d78a062617a..ec8666a1af4a 100644 --- a/extras/source/templates/presnt/Classy_Red/content.xml +++ b/extras/source/templates/presnt/Classy_Red/content.xml @@ -67,7 +67,6 @@ - @@ -86,7 +85,6 @@ - diff --git a/extras/source/templates/presnt/Classy_Red/styles.xml b/extras/source/templates/presnt/Classy_Red/styles.xml index c66b0804692e..f7ecbd246f26 100644 --- a/extras/source/templates/presnt/Classy_Red/styles.xml +++ b/extras/source/templates/presnt/Classy_Red/styles.xml @@ -11,7 +11,7 @@ - + @@ -59,7 +59,7 @@ - + @@ -75,7 +75,7 @@ - + @@ -87,41 +87,41 @@ - + - + - + - + - + - + - + - + @@ -151,7 +151,7 @@ - + @@ -199,39 +199,39 @@ - + - + - + - + - + - + - + - + - + @@ -279,7 +279,7 @@ - + @@ -329,7 +329,7 @@ - + @@ -341,7 +341,7 @@ - + @@ -389,39 +389,39 @@ - + - + - + - + - + - + - + - + - + @@ -469,7 +469,7 @@ - + @@ -517,7 +517,7 @@ - + @@ -583,49 +583,49 @@ - + - + - + - + - + - + - + - + - + - + @@ -634,10 +634,10 @@ - + - + commit d69bc15a2a76ccecbed64984972417c7fe0a475b Author: Laurent BP AuthorDate: Mon Oct 14 20:51:18 2019 +0200 Commit: Laurent BP CommitDate: Thu Nov 14 19:15:55 2019 +0100 tdf#114746 Restore asian and complex tags in BrightBlue template Manually add tags to fix size, bold and italic: style:font-size-asian style:font-size-complex style:font-style-asian style:font-style-complex style:font-weight-asian style:font-weight-complex Change-Id: Ic95e94eed9992d679add70f73ba5c588002e16a7 Reviewed-on: https://gerrit.libreoffice.org/80798 Tested-by: Jenkins Reviewed-by: Laurent BP diff --git a/extras/source/templates/presnt/BrightBlue/styles.xml b/extras/source/templates/presnt/BrightBlue/styles.xml index 898f4ca404ba..6525bbb98b98 100644 --- a/extras/source/templates/presnt/BrightBlue/styles.xml +++ b/extras/source/templates/presnt/BrightBlue/styles.xml @@ -10,7 +10,7 @@ - +
[Libreoffice-commits] core.git: 2 commits - extras/source
extras/source/templates/presnt/Blue_Curve/styles.xml | 80 +++--- extras/source/templates/presnt/Blueprint_Plans/styles.xml | 80 +++--- 2 files changed, 80 insertions(+), 80 deletions(-) New commits: commit f8ad76e1ea0ba0bacce75f98f4f60dbb86c284a6 Author: Laurent BP AuthorDate: Mon Oct 14 20:28:54 2019 +0200 Commit: Laurent BP CommitDate: Thu Nov 14 19:15:27 2019 +0100 tdf#114746 Restore asian and complex tags in Blueprint_Plans template Manually add tags to fix size, bold and italic: style:font-size-asian style:font-size-complex style:font-style-asian style:font-style-complex style:font-weight-asian style:font-weight-complex Change-Id: I9cee55543d2c8dade79b85ea1e65d79ad2c37858 Reviewed-on: https://gerrit.libreoffice.org/80792 Tested-by: Jenkins Reviewed-by: Laurent BP diff --git a/extras/source/templates/presnt/Blueprint_Plans/styles.xml b/extras/source/templates/presnt/Blueprint_Plans/styles.xml index a0a9f120ba45..207cefef4e02 100644 --- a/extras/source/templates/presnt/Blueprint_Plans/styles.xml +++ b/extras/source/templates/presnt/Blueprint_Plans/styles.xml @@ -12,7 +12,7 @@ - + @@ -60,7 +60,7 @@ - + @@ -76,7 +76,7 @@ - + @@ -88,36 +88,36 @@ - + - + - + - + - + - + - + @@ -130,7 +130,7 @@ - + @@ -178,7 +178,7 @@ - + @@ -258,7 +258,7 @@ - + @@ -306,7 +306,7 @@ - + @@ -319,7 +319,7 @@ - + @@ -367,39 +367,39 @@ - + - + - + - + - + - + - + - + - + @@ -447,7 +447,7 @@ - + @@ -495,7 +495,7 @@ - + @@ -555,60 +555,60 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + commit 7b13f1efa835a90fd1c5554b70a62bf8e395a69f Author: Laurent BP AuthorDate: Mon Oct 14 20:08:47 2019 +0200 Commit: Laurent BP CommitDate: Thu Nov 14 19:15:05 2019 +0100 tdf#114746 Restore asian and complex tags in Blue_Curve template Manually add tags to fix size, bold and italic: style:font-size-asian style:font-size-complex style:font-style-asian style:font-style-complex style:font-weight-asian style:font-weight-complex Change-Id: I18e266cbacf6bb461dd58afaee572e874609907f Reviewed-on: https://gerrit.libreoffice.org/80791 Tested-by: Jenkins Reviewed-by: Laurent BP diff --git a/extras/source/templates/presnt/Blue_Curve/styles.xml b/extras/source/templates/presnt/Blue_Curve/styles.xml index eb813f72ee87..b4c5f4ad7b63 100644 --- a/extras/source/templates/presnt/Blue_Curve/styles.xml +++ b/extras/source/templates/presnt/Blue_Curve/styles.xml @@ -11,7 +11,7 @@ - + @@ -59,7 +59,7 @@ - + @@ -87,36 +87,36 @@ - + - + - + - + - + - + - + @@ -129,7 +129,7 @@ - + @@ -177,39 +177,39 @@ - + - + - + - + - + - + -
[Libreoffice-commits] core.git: 2 commits - extras/source translations
extras/source/autocorr/lang/ca/DocumentList.xml|2 extras/source/autocorr/lang/es/DocumentList.xml| 141 +- extras/source/autocorr/lang/fi/DocumentList.xml| 293 - extras/source/autocorr/lang/hr/DocumentList.xml| 41 +- extras/source/autocorr/lang/hsb/DocumentList.xml |2 extras/source/autocorr/lang/is/DocumentList.xml|4 extras/source/autocorr/lang/pt-PT/DocumentList.xml |3 extras/source/autocorr/lang/pt/DocumentList.xml|3 extras/source/autocorr/lang/zh-CN/DocumentList.xml | 20 - translations |2 10 files changed, 473 insertions(+), 38 deletions(-) New commits: commit dfb2a1a96f6243373419a3ffbecc15aa04fed3ec Author: Christian Lohmaier AuthorDate: Fri Nov 8 23:46:06 2019 +0100 Commit: Christian Lohmaier CommitDate: Fri Nov 8 23:49:56 2019 +0100 update emoji autocorrect files from po-files Change-Id: I4bf4ecc018844509333cbd1dad5e8c1b595321b7 diff --git a/extras/source/autocorr/lang/ca/DocumentList.xml b/extras/source/autocorr/lang/ca/DocumentList.xml index 45c05136c38a..3a579b7264ea 100644 --- a/extras/source/autocorr/lang/ca/DocumentList.xml +++ b/extras/source/autocorr/lang/ca/DocumentList.xml @@ -622,7 +622,7 @@ - + diff --git a/extras/source/autocorr/lang/es/DocumentList.xml b/extras/source/autocorr/lang/es/DocumentList.xml index a37380ed411c..3a6432bc4cfd 100644 --- a/extras/source/autocorr/lang/es/DocumentList.xml +++ b/extras/source/autocorr/lang/es/DocumentList.xml @@ -560,16 +560,24 @@ + + + + + + + + @@ -582,11 +590,16 @@ + + + + + @@ -601,11 +614,15 @@ + + + + @@ -624,6 +641,7 @@ + @@ -631,6 +649,7 @@ + @@ -646,7 +665,10 @@ + + + @@ -684,6 +706,8 @@ + + @@ -730,9 +754,12 @@ + + + @@ -753,6 +780,7 @@ + @@ -773,11 +801,13 @@ + + @@ -789,6 +819,7 @@ + @@ -804,6 +835,7 @@ + @@ -813,6 +845,9 @@ + + + @@ -820,6 +855,7 @@ + @@ -835,6 +871,7 @@ + @@ -851,9 +888,11 @@ + + @@ -870,9 +909,11 @@ + + @@ -914,6 +955,8 @@ + + @@ -931,6 +974,7 @@ + @@ -948,6 +992,7 @@ + @@ -960,18 +1005,19 @@ + + + + + - - - - @@ -988,6 +1034,7 @@ + @@ -1031,6 +1078,7 @@ + @@ -1044,6 +1092,7 @@ + @@ -1056,7 +1105,9 @@ + + @@ -1098,7 +1149,10 @@ + + + @@ -1122,6 +1176,7 @@ + @@ -1154,11 +1209,17 @@ + + + + + + @@ -1219,6 +1280,7 @@ + @@ -1228,6 +1290,9 @@ + + + @@ -1245,6 +1310,7 @@ + @@ -1254,13 +1320,16 @@ + + + @@ -1289,6 +1358,7 @@ + @@ -1299,8 +1369,10 @@ + + @@ -1314,17 +1386,23 @@ + + + + + + @@ -1374,6 +1452,8 @@ + + @@ -1400,6 +1480,7 @@ + @@ -1412,12 +1493,14 @@ + + @@ -1434,6 +1517,7 @@ + @@ -1458,6 +1542,7 @@ + @@ -1469,6 +1554,7 @@ + @@ -1476,19 +1562,28 @@ + + + + + + + + + @@ -1523,15 +1618,19 @@ + + + + @@ -1563,15 +1662,18 @@ + + + @@ -1597,6 +1699,7 @@ + @@ -1611,6 +1714,8 @@ + + @@ -1622,13 +1727,19 @@ + + + + + + @@ -1647,12 +1758,14 @@ + + @@ -1669,6 +1782,7 @@ + @@ -1676,6 +1790,8 @@ + + @@ -1697,6 +1813,7 @@ + @@ -1711,6 +1828,7 @@ + @@ -1724,6 +1842,7 @@ +
[Libreoffice-commits] core.git: 2 commits - extras/source include/svx include/vcl reportdesign/source reportdesign/uiconfig sc/uiconfig solenv/bin svx/inc svx/source vcl/source vcl/unx
extras/source/glade/libreoffice-catalog.xml.in| 12 include/svx/colorwindow.hxx | 21 + include/svx/fntctrl.hxx | 35 -- include/vcl/weld.hxx |9 reportdesign/source/ui/dlg/AddField.cxx | 10 reportdesign/source/ui/dlg/CondFormat.cxx | 228 ++--- reportdesign/source/ui/dlg/Condition.cxx | 295 ++-- reportdesign/source/ui/dlg/Condition.hxx | 116 +++--- reportdesign/source/ui/inc/AddField.hxx |6 reportdesign/source/ui/inc/CondFormat.hxx | 40 -- reportdesign/source/ui/inc/GroupsSorting.hxx |2 reportdesign/source/ui/misc/UITools.cxx |3 reportdesign/source/ui/report/ReportController.cxx|4 reportdesign/uiconfig/dbreport/ui/condformatdialog.ui | 10 reportdesign/uiconfig/dbreport/ui/conditionwin.ui | 82 ++-- sc/uiconfig/scalc/ui/conditionalentrymobile.ui|2 solenv/bin/native-code.py |1 svx/inc/pch/precompiled_svx.hxx |4 svx/inc/pch/precompiled_svxcore.hxx | 27 - svx/source/dialog/fntctrl.cxx | 313 -- svx/source/tbxctrls/tbcontrl.cxx | 59 ++- vcl/source/app/salvtables.cxx | 59 +++ vcl/unx/gtk3/gtk3gtkinst.cxx | 79 23 files changed, 501 insertions(+), 916 deletions(-) New commits: commit d854687a1316783e40d227756fef08af925e93e6 Author: Caolán McNamara AuthorDate: Fri Oct 11 13:04:14 2019 +0100 Commit: Caolán McNamara CommitDate: Sun Oct 13 16:16:39 2019 +0200 SvxFontPrevWindow is now unused sc/uiconfig/scalc/ui/conditionalentrymobile.ui was already non-functional before this change Change-Id: I07743a8fcca4b3cf325ce3d3d0699bf68c0115f3 Reviewed-on: https://gerrit.libreoffice.org/80690 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/include/svx/fntctrl.hxx b/include/svx/fntctrl.hxx index 5332c98ed52e..f2489c750f3c 100644 --- a/include/svx/fntctrl.hxx +++ b/include/svx/fntctrl.hxx @@ -28,35 +28,6 @@ class SfxItemSet; class FontPrevWin_Impl; -class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxFontPrevWindow : public vcl::Window -{ -using OutputDevice::SetFont; -private: -std::unique_ptr pImpl; -bool mbResetForeground : 1; -bool mbResetBackground : 1; - -SVX_DLLPRIVATE void ResetSettings(bool bForeground, bool bBackground); -SVX_DLLPRIVATE void ApplySettings(vcl::RenderContext& rRenderContext) override; -SVX_DLLPRIVATE void Init (); - -public: -SvxFontPrevWindow(vcl::Window* pParent, WinBits nStyle); -virtual ~SvxFontPrevWindow() override; -virtual voiddispose() override; - -virtual voidStateChanged( StateChangedType nStateChange ) override; -virtual voidDataChanged( const DataChangedEvent& rDCEvt ) override; - -voidSetFont( const SvxFont& rNormalFont, const SvxFont& rCJKFont, const SvxFont& rCTLFont ); -voidSetBackColor( const Color& rColor ); -voidPaint( vcl::RenderContext& rRenderContext, const tools::Rectangle& ) override; - -boolIsTwoLines() const; - -virtual Size GetOptimalSize() const override; -}; - class SAL_WARN_UNUSED SVX_DLLPUBLIC FontPrevWindow : public weld::CustomWidgetController { private: diff --git a/sc/uiconfig/scalc/ui/conditionalentrymobile.ui b/sc/uiconfig/scalc/ui/conditionalentrymobile.ui index a4f1b39185bd..3b1cda8a5661 100644 --- a/sc/uiconfig/scalc/ui/conditionalentrymobile.ui +++ b/sc/uiconfig/scalc/ui/conditionalentrymobile.ui @@ -92,7 +92,7 @@ - + False Example diff --git a/svx/inc/pch/precompiled_svx.hxx b/svx/inc/pch/precompiled_svx.hxx index 083aff353175..85a2bc8ba450 100644 --- a/svx/inc/pch/precompiled_svx.hxx +++ b/svx/inc/pch/precompiled_svx.hxx @@ -13,7 +13,7 @@ manual changes will be rewritten by the next run of update_pch.sh (which presumably also fixes all possible problems, so it's usually better to use it). - Generated on 2019-10-02 17:03:44 using: + Generated on 2019-10-11 13:05:53 using: ./bin/update_pch svx svx --cutoff=3 --exclude:system --exclude:module --include:local If after updating build fails, use the following command to locate conflicting headers: @@ -59,10 +59,8 @@ #include #include #include -#include #include #include -#include #include #include #include diff --git a/svx/inc/pch/precompiled_svxcore.hxx b/svx/inc/pch/precompiled_svxcore.hxx index a576a2da5eca..3978d42f17cd 100644 --- a/svx/inc/pch/precompiled_svxcore.hxx +++ b/svx/inc/pch/precompiled_svxcore.hxx @@ -13,7
[Libreoffice-commits] core.git: 2 commits - extras/source
extras/source/autotext/lang/tt/standard/FN/content.xml |6 +++--- extras/source/autotext/lang/ug/standard/FN/content.xml |6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) New commits: commit 2ff2cb9e3d75c1b26c7f5aa37891b30e97838132 Author: Laurent BP AuthorDate: Sun Sep 15 20:06:31 2019 +0200 Commit: Laurent BP CommitDate: Tue Sep 24 21:55:09 2019 +0200 Improve FN AutoText for ug Translate names which appear in Navigator Change-Id: I1261a5aa2dee679a85597d5b499e6e07e5a450ff Reviewed-on: https://gerrit.libreoffice.org/78961 Tested-by: Jenkins Reviewed-by: Laurent BP diff --git a/extras/source/autotext/lang/ug/standard/FN/content.xml b/extras/source/autotext/lang/ug/standard/FN/content.xml index b41b40baf853..45d0087ab55b 100644 --- a/extras/source/autotext/lang/ug/standard/FN/content.xml +++ b/extras/source/autotext/lang/ug/standard/FN/content.xml @@ -34,13 +34,13 @@ - + - + formula @@ -52,4 +52,4 @@ - \ No newline at end of file + commit a5751a4d36b95c6d22161c245950c57db7df542a Author: Laurent BP AuthorDate: Sun Sep 15 18:05:50 2019 +0200 Commit: Laurent BP CommitDate: Tue Sep 24 21:54:41 2019 +0200 Improve FN AutoText for tt Translate names which appear in Navigator Change-Id: Ifd05a7cc8348767018ae25bd815c207b76e8e01e Reviewed-on: https://gerrit.libreoffice.org/78959 Tested-by: Jenkins Reviewed-by: Laurent BP diff --git a/extras/source/autotext/lang/tt/standard/FN/content.xml b/extras/source/autotext/lang/tt/standard/FN/content.xml index b41b40baf853..4e1d1a27741a 100644 --- a/extras/source/autotext/lang/tt/standard/FN/content.xml +++ b/extras/source/autotext/lang/tt/standard/FN/content.xml @@ -34,13 +34,13 @@ - + - + formula @@ -52,4 +52,4 @@ - \ 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: 2 commits - extras/source
extras/source/autotext/lang/te/standard/FN/content.xml |6 +++--- extras/source/autotext/lang/tg/standard/FN/content.xml |6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) New commits: commit 0ca87fab70b9fb7d941e0b56155e987ce084d543 Author: Laurent BP AuthorDate: Sun Sep 15 17:52:09 2019 +0200 Commit: Laurent BP CommitDate: Tue Sep 24 21:53:07 2019 +0200 Improve FN AutoText for tg Translate names which appear in Navigator Change-Id: I1964454fb1fbc4de51648470a34f7fe6c0bda971 Reviewed-on: https://gerrit.libreoffice.org/78955 Tested-by: Jenkins Reviewed-by: Laurent BP diff --git a/extras/source/autotext/lang/tg/standard/FN/content.xml b/extras/source/autotext/lang/tg/standard/FN/content.xml index b41b40baf853..b4605da7c9bb 100644 --- a/extras/source/autotext/lang/tg/standard/FN/content.xml +++ b/extras/source/autotext/lang/tg/standard/FN/content.xml @@ -34,13 +34,13 @@ - + - + formula @@ -52,4 +52,4 @@ - \ No newline at end of file + commit 1b563f12b216e315bc77acb69a1e5a4745323aea Author: Laurent BP AuthorDate: Sun Sep 15 17:48:50 2019 +0200 Commit: Laurent BP CommitDate: Tue Sep 24 21:52:28 2019 +0200 Improve FN AutoText for te Translate names which appear in Navigator Change-Id: I7a6394a0d4d4b629defade5e7df5d9248a951360 Reviewed-on: https://gerrit.libreoffice.org/78954 Tested-by: Jenkins Reviewed-by: Laurent BP diff --git a/extras/source/autotext/lang/te/standard/FN/content.xml b/extras/source/autotext/lang/te/standard/FN/content.xml index b41b40baf853..61149cad93b9 100644 --- a/extras/source/autotext/lang/te/standard/FN/content.xml +++ b/extras/source/autotext/lang/te/standard/FN/content.xml @@ -34,13 +34,13 @@ - + - + formula @@ -52,4 +52,4 @@ - \ 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: 2 commits - extras/source
extras/source/autotext/lang/sw-TZ/standard/FN/content.xml |6 +++--- extras/source/autotext/lang/szl/standard/FN/content.xml |6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) New commits: commit 9505c0f61de7ddcab969d5a63015cda19948acda Author: Laurent BP AuthorDate: Sun Sep 15 17:41:38 2019 +0200 Commit: Laurent BP CommitDate: Tue Sep 24 21:51:17 2019 +0200 Improve FN AutoText for szl Translate names which appear in Navigator Change-Id: I191cc0376a683e2efd1249bf7aa7761fd5819463 Reviewed-on: https://gerrit.libreoffice.org/78952 Tested-by: Jenkins Reviewed-by: Laurent BP diff --git a/extras/source/autotext/lang/szl/standard/FN/content.xml b/extras/source/autotext/lang/szl/standard/FN/content.xml index b41b40baf853..5fb9c1d49ee3 100644 --- a/extras/source/autotext/lang/szl/standard/FN/content.xml +++ b/extras/source/autotext/lang/szl/standard/FN/content.xml @@ -34,13 +34,13 @@ - + - + formula @@ -52,4 +52,4 @@ - \ No newline at end of file + commit 130b0ffd491015df2dc1d6b272952d76980f0465 Author: Laurent BP AuthorDate: Sun Sep 15 17:38:32 2019 +0200 Commit: Laurent BP CommitDate: Tue Sep 24 21:50:49 2019 +0200 Improve FN AutoText for sw-TZ Translate names which appear in Navigator Change-Id: I2ceaaebcdfefd0cfd482f801b32eac928f29cb92 Reviewed-on: https://gerrit.libreoffice.org/78951 Tested-by: Jenkins Reviewed-by: Laurent BP diff --git a/extras/source/autotext/lang/sw-TZ/standard/FN/content.xml b/extras/source/autotext/lang/sw-TZ/standard/FN/content.xml index b41b40baf853..526786b63c4b 100644 --- a/extras/source/autotext/lang/sw-TZ/standard/FN/content.xml +++ b/extras/source/autotext/lang/sw-TZ/standard/FN/content.xml @@ -34,13 +34,13 @@ - + - + formula @@ -52,4 +52,4 @@ - \ 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: 2 commits - extras/source
extras/source/autotext/lang/ss/standard/FN/content.xml |6 +++--- extras/source/autotext/lang/st/standard/FN/content.xml |6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) New commits: commit d4913aece53c7d4f293a1c5d0d129bd87497716d Author: Laurent BP AuthorDate: Sun Sep 15 17:35:30 2019 +0200 Commit: Laurent BP CommitDate: Tue Sep 24 21:50:15 2019 +0200 Improve FN AutoText for st Translate names which appear in Navigator Change-Id: I443ccba5967986a989ab22b5273af302e2ffd7e3 Reviewed-on: https://gerrit.libreoffice.org/78950 Tested-by: Jenkins Reviewed-by: Laurent BP diff --git a/extras/source/autotext/lang/st/standard/FN/content.xml b/extras/source/autotext/lang/st/standard/FN/content.xml index b41b40baf853..d9d081b79a4c 100644 --- a/extras/source/autotext/lang/st/standard/FN/content.xml +++ b/extras/source/autotext/lang/st/standard/FN/content.xml @@ -34,13 +34,13 @@ - + - + formula @@ -52,4 +52,4 @@ - \ No newline at end of file + commit e3f2df396e6663c52e4ed70fb1f3229a0ac19ef3 Author: Laurent BP AuthorDate: Sun Sep 15 17:27:35 2019 +0200 Commit: Laurent BP CommitDate: Tue Sep 24 21:49:49 2019 +0200 Improve FN AutoText for ss Translate names which appear in Navigator Change-Id: Ia7c9e02e1c40ab322bb8f6f19e4fbbdd3da3968b Reviewed-on: https://gerrit.libreoffice.org/78949 Tested-by: Jenkins Reviewed-by: Laurent BP diff --git a/extras/source/autotext/lang/ss/standard/FN/content.xml b/extras/source/autotext/lang/ss/standard/FN/content.xml index b41b40baf853..add2a781462c 100644 --- a/extras/source/autotext/lang/ss/standard/FN/content.xml +++ b/extras/source/autotext/lang/ss/standard/FN/content.xml @@ -34,13 +34,13 @@ - + - + formula @@ -52,4 +52,4 @@ - \ 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: 2 commits - extras/source
extras/source/autotext/lang/sid/standard/FN/content.xml |6 +++--- extras/source/autotext/lang/sq/standard/FN/content.xml |6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) New commits: commit df71419ec4340cfb2ac7433f2e290b46706928b7 Author: Laurent BP AuthorDate: Sun Sep 15 17:23:36 2019 +0200 Commit: Laurent BP CommitDate: Tue Sep 24 21:49:17 2019 +0200 Improve FN AutoText for sq Translate names which appear in Navigator Change-Id: Ifbfa18db451e02bd3fc976e283ae7b33a5e9afd0 Reviewed-on: https://gerrit.libreoffice.org/78947 Tested-by: Jenkins Reviewed-by: Laurent BP diff --git a/extras/source/autotext/lang/sq/standard/FN/content.xml b/extras/source/autotext/lang/sq/standard/FN/content.xml index b41b40baf853..9b087c796603 100644 --- a/extras/source/autotext/lang/sq/standard/FN/content.xml +++ b/extras/source/autotext/lang/sq/standard/FN/content.xml @@ -34,13 +34,13 @@ - + - + formula @@ -52,4 +52,4 @@ - \ No newline at end of file + commit 41b43bde5c8582a40ae1c9cdde596ac030a18f90 Author: Laurent BP AuthorDate: Sun Sep 15 17:19:55 2019 +0200 Commit: Laurent BP CommitDate: Tue Sep 24 21:48:49 2019 +0200 Improve FN AutoText for sid Translate names which appear in Navigator Change-Id: I0bd3097d82f63a51c5eb862920ad23f2be4ea92c Reviewed-on: https://gerrit.libreoffice.org/78946 Tested-by: Jenkins Reviewed-by: Laurent BP diff --git a/extras/source/autotext/lang/sid/standard/FN/content.xml b/extras/source/autotext/lang/sid/standard/FN/content.xml index b41b40baf853..93848e3d587b 100644 --- a/extras/source/autotext/lang/sid/standard/FN/content.xml +++ b/extras/source/autotext/lang/sid/standard/FN/content.xml @@ -34,13 +34,13 @@ - + - + formula @@ -52,4 +52,4 @@ - \ 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: 2 commits - extras/source
extras/source/autotext/lang/sd/standard/FN/content.xml |6 +++--- extras/source/autotext/lang/si/standard/FN/content.xml |6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) New commits: commit 3fca595afb45e5bcf4eb42d5623ef6fae0e52e3b Author: Laurent BP AuthorDate: Sun Sep 15 17:13:13 2019 +0200 Commit: Laurent BP CommitDate: Tue Sep 24 21:48:31 2019 +0200 Improve FN AutoText for si Translate names which appear in Navigator Change-Id: I4464413ed92bbbda41ec1ce1dd6a8ba0fb814865 Reviewed-on: https://gerrit.libreoffice.org/78945 Tested-by: Jenkins Reviewed-by: Laurent BP diff --git a/extras/source/autotext/lang/si/standard/FN/content.xml b/extras/source/autotext/lang/si/standard/FN/content.xml index b41b40baf853..e1db712bec0e 100644 --- a/extras/source/autotext/lang/si/standard/FN/content.xml +++ b/extras/source/autotext/lang/si/standard/FN/content.xml @@ -34,13 +34,13 @@ - + - + formula @@ -52,4 +52,4 @@ - \ No newline at end of file + commit d7155b7464af09176d9d94b5ec2fbd0b48bbf455 Author: Laurent BP AuthorDate: Sun Sep 15 17:04:51 2019 +0200 Commit: Laurent BP CommitDate: Tue Sep 24 21:48:09 2019 +0200 Improve FN AutoText for sd Translate names which appear in Navigator Change-Id: Ia37f0d16120216fb32b7d4ab480ff05a1038ee04 Reviewed-on: https://gerrit.libreoffice.org/78944 Tested-by: Jenkins Reviewed-by: Laurent BP diff --git a/extras/source/autotext/lang/sd/standard/FN/content.xml b/extras/source/autotext/lang/sd/standard/FN/content.xml index b41b40baf853..642a7c1eefeb 100644 --- a/extras/source/autotext/lang/sd/standard/FN/content.xml +++ b/extras/source/autotext/lang/sd/standard/FN/content.xml @@ -34,13 +34,13 @@ - + - + formula @@ -52,4 +52,4 @@ - \ 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: 2 commits - extras/source
extras/source/autotext/lang/or/standard/FN/content.xml|6 +++--- extras/source/autotext/lang/pa-IN/standard/FN/content.xml |6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) New commits: commit 4c1a1b8661ea11d74834511408b5c2ffa41df251 Author: Laurent BP AuthorDate: Sun Sep 15 16:28:09 2019 +0200 Commit: Laurent BP CommitDate: Tue Sep 24 21:46:41 2019 +0200 Improve FN AutoText for pa-IN Translate names which appear in Navigator Change-Id: I43942907f6eb3470aee9d465da9f845912c4c020 Reviewed-on: https://gerrit.libreoffice.org/78937 Tested-by: Jenkins Reviewed-by: Laurent BP diff --git a/extras/source/autotext/lang/pa-IN/standard/FN/content.xml b/extras/source/autotext/lang/pa-IN/standard/FN/content.xml index b41b40baf853..a5c2dfaf5a1e 100644 --- a/extras/source/autotext/lang/pa-IN/standard/FN/content.xml +++ b/extras/source/autotext/lang/pa-IN/standard/FN/content.xml @@ -34,13 +34,13 @@ - + - + formula @@ -52,4 +52,4 @@ - \ No newline at end of file + commit ba06e0444628c52d9b4a9c037137398162e6fe52 Author: Laurent BP AuthorDate: Sun Sep 15 16:20:11 2019 +0200 Commit: Laurent BP CommitDate: Tue Sep 24 21:46:25 2019 +0200 Improve FN AutoText for or Translate names which appear in Navigator Change-Id: I063360897b357e433b43ca63c4833514d96f7cec Reviewed-on: https://gerrit.libreoffice.org/78936 Tested-by: Jenkins Reviewed-by: Laurent BP diff --git a/extras/source/autotext/lang/or/standard/FN/content.xml b/extras/source/autotext/lang/or/standard/FN/content.xml index b41b40baf853..579c2fbf3af9 100644 --- a/extras/source/autotext/lang/or/standard/FN/content.xml +++ b/extras/source/autotext/lang/or/standard/FN/content.xml @@ -34,13 +34,13 @@ - + - + formula @@ -52,4 +52,4 @@ - \ 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: 2 commits - extras/source
extras/source/autotext/lang/my/standard/FN/content.xml |6 +++--- extras/source/autotext/lang/nb/standard/FN/content.xml |6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) New commits: commit 1b8dfc231dba90f3cd2017b9b249f8fb34e7f04a Author: Laurent BP AuthorDate: Sun Sep 15 15:45:06 2019 +0200 Commit: Laurent BP CommitDate: Tue Sep 24 21:43:12 2019 +0200 Improve FN AutoText for nb Translate names which appear in Navigator Change-Id: I90c9971090c15905c6fc16720c900e3768334f43 Reviewed-on: https://gerrit.libreoffice.org/78929 Tested-by: Jenkins Reviewed-by: Laurent BP diff --git a/extras/source/autotext/lang/nb/standard/FN/content.xml b/extras/source/autotext/lang/nb/standard/FN/content.xml index b41b40baf853..1f7940a4e8ac 100644 --- a/extras/source/autotext/lang/nb/standard/FN/content.xml +++ b/extras/source/autotext/lang/nb/standard/FN/content.xml @@ -34,13 +34,13 @@ - + - + formula @@ -52,4 +52,4 @@ - \ No newline at end of file + commit ccc9dc12b32e7075a37adf88bfbb477312daf632 Author: Laurent BP AuthorDate: Sat Sep 14 21:27:11 2019 +0200 Commit: Laurent BP CommitDate: Tue Sep 24 21:42:53 2019 +0200 Improve FN AutoText for my Translate names which appear in Navigator Change-Id: I5370dde14e32c434f7802b6ac394fd2648690cd3 Reviewed-on: https://gerrit.libreoffice.org/78921 Tested-by: Jenkins Reviewed-by: Laurent BP diff --git a/extras/source/autotext/lang/my/standard/FN/content.xml b/extras/source/autotext/lang/my/standard/FN/content.xml index b41b40baf853..3cd08fdf566e 100644 --- a/extras/source/autotext/lang/my/standard/FN/content.xml +++ b/extras/source/autotext/lang/my/standard/FN/content.xml @@ -34,13 +34,13 @@ - + - + formula @@ -52,4 +52,4 @@ - \ 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: 2 commits - extras/source
extras/source/autotext/lang/mni/standard/FN/content.xml |6 +++--- extras/source/autotext/lang/mr/standard/FN/content.xml |6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) New commits: commit 081750a264358accc783a8b9476ce68bfd8fc4ec Author: Laurent BP AuthorDate: Sat Sep 14 21:21:22 2019 +0200 Commit: Laurent BP CommitDate: Tue Sep 24 21:42:15 2019 +0200 Improve FN AutoText for mr Translate names which appear in Navigator Change-Id: I5f86ebc87e3134ab15cf9278da9017b9035d93ee Reviewed-on: https://gerrit.libreoffice.org/78920 Tested-by: Jenkins Reviewed-by: Laurent BP diff --git a/extras/source/autotext/lang/mr/standard/FN/content.xml b/extras/source/autotext/lang/mr/standard/FN/content.xml index b41b40baf853..f9aaff61b279 100644 --- a/extras/source/autotext/lang/mr/standard/FN/content.xml +++ b/extras/source/autotext/lang/mr/standard/FN/content.xml @@ -34,13 +34,13 @@ - + - + formula @@ -52,4 +52,4 @@ - \ No newline at end of file + commit 1373ed4d59c284d7f86cb2d40d1bca625afc5344 Author: Laurent BP AuthorDate: Sat Sep 14 21:13:20 2019 +0200 Commit: Laurent BP CommitDate: Tue Sep 24 21:41:41 2019 +0200 Improve FN AutoText for mni Translate names which appear in Navigator Change-Id: Ia7375fe31f19b6932a54c6ca9a468e772698b863 Reviewed-on: https://gerrit.libreoffice.org/78919 Tested-by: Jenkins Reviewed-by: Laurent BP diff --git a/extras/source/autotext/lang/mni/standard/FN/content.xml b/extras/source/autotext/lang/mni/standard/FN/content.xml index b41b40baf853..3eaefd0e6411 100644 --- a/extras/source/autotext/lang/mni/standard/FN/content.xml +++ b/extras/source/autotext/lang/mni/standard/FN/content.xml @@ -34,13 +34,13 @@ - + - + formula @@ -52,4 +52,4 @@ - \ 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: 2 commits - extras/source
extras/source/autotext/lang/lo/standard/FN/content.xml |6 +++--- extras/source/autotext/lang/lv/standard/FN/content.xml |6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) New commits: commit f6e2d9cf07c29883172518d34d41f0deb7fc0c5d Author: Laurent BP AuthorDate: Sat Sep 14 20:51:15 2019 +0200 Commit: Laurent BP CommitDate: Tue Sep 24 21:40:04 2019 +0200 Improve FN AutoText for lv Translate names which appear in Navigator Change-Id: Id11abcafd1aa69f4dec8a40ecf00dd01e19ae12e Reviewed-on: https://gerrit.libreoffice.org/78915 Tested-by: Jenkins Reviewed-by: Laurent BP diff --git a/extras/source/autotext/lang/lv/standard/FN/content.xml b/extras/source/autotext/lang/lv/standard/FN/content.xml index b41b40baf853..8f05f7f5eba6 100644 --- a/extras/source/autotext/lang/lv/standard/FN/content.xml +++ b/extras/source/autotext/lang/lv/standard/FN/content.xml @@ -34,13 +34,13 @@ - + - + formula @@ -52,4 +52,4 @@ - \ No newline at end of file + commit 9372f26e780a1ffa2c22f7b0704cb566677dc347 Author: Laurent BP AuthorDate: Sat Sep 14 20:43:20 2019 +0200 Commit: Laurent BP CommitDate: Tue Sep 24 21:39:44 2019 +0200 Improve FN AutoText for lo Translate names which appear in Navigator Change-Id: I430dd355cdfba25ef0b1901ceabfd7f0970f3647 Reviewed-on: https://gerrit.libreoffice.org/78914 Tested-by: Jenkins Reviewed-by: Laurent BP diff --git a/extras/source/autotext/lang/lo/standard/FN/content.xml b/extras/source/autotext/lang/lo/standard/FN/content.xml index b41b40baf853..2ba7198debd3 100644 --- a/extras/source/autotext/lang/lo/standard/FN/content.xml +++ b/extras/source/autotext/lang/lo/standard/FN/content.xml @@ -34,13 +34,13 @@ - + - + formula @@ -52,4 +52,4 @@ - \ 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: 2 commits - extras/source
extras/source/autotext/lang/ks/standard/FN/content.xml |6 +++--- extras/source/autotext/lang/lb/standard/FN/content.xml |6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) New commits: commit 0b3d98fa73c353d60c7d1ec69389927a2603c215 Author: Laurent BP AuthorDate: Sat Sep 14 20:38:58 2019 +0200 Commit: Laurent BP CommitDate: Tue Sep 24 21:39:18 2019 +0200 Improve FN AutoText for lb Translate names which appear in Navigator Change-Id: I01b4672a25fbf3e8f456513566919bcedce1eee4 Reviewed-on: https://gerrit.libreoffice.org/78913 Tested-by: Jenkins Reviewed-by: Laurent BP diff --git a/extras/source/autotext/lang/lb/standard/FN/content.xml b/extras/source/autotext/lang/lb/standard/FN/content.xml index b41b40baf853..2edc4d05b859 100644 --- a/extras/source/autotext/lang/lb/standard/FN/content.xml +++ b/extras/source/autotext/lang/lb/standard/FN/content.xml @@ -34,13 +34,13 @@ - + - + formula @@ -52,4 +52,4 @@ - \ No newline at end of file + commit aece40026d0e145c1c5acd10fd827ae500ea9208 Author: Laurent BP AuthorDate: Sat Sep 14 19:29:14 2019 +0200 Commit: Laurent BP CommitDate: Tue Sep 24 21:38:58 2019 +0200 Improve FN AutoText for ks Translate names which appear in Navigator Change-Id: I4516d0220e6c5961cecf78f8d85a14766b8a26cd Reviewed-on: https://gerrit.libreoffice.org/78910 Tested-by: Jenkins Reviewed-by: Laurent BP diff --git a/extras/source/autotext/lang/ks/standard/FN/content.xml b/extras/source/autotext/lang/ks/standard/FN/content.xml index b41b40baf853..cb29120051e7 100644 --- a/extras/source/autotext/lang/ks/standard/FN/content.xml +++ b/extras/source/autotext/lang/ks/standard/FN/content.xml @@ -34,13 +34,13 @@ - + - + formula @@ -52,4 +52,4 @@ - \ 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: 2 commits - extras/source
extras/source/autotext/lang/kab/standard/FN/content.xml |6 +++--- extras/source/autotext/lang/kk/standard/FN/content.xml |6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) New commits: commit 8b207c0573ec7c598d86b20dce997615bf005025 Author: Laurent BP AuthorDate: Sat Sep 14 19:10:16 2019 +0200 Commit: Laurent BP CommitDate: Tue Sep 24 21:37:14 2019 +0200 Improve FN AutoText for kk Translate names which appear in Navigator Change-Id: I69f1166a7a57941ece5e35f4ca09c28116778eab Reviewed-on: https://gerrit.libreoffice.org/78906 Tested-by: Jenkins Reviewed-by: Laurent BP diff --git a/extras/source/autotext/lang/kk/standard/FN/content.xml b/extras/source/autotext/lang/kk/standard/FN/content.xml index b41b40baf853..f9545b3d2555 100644 --- a/extras/source/autotext/lang/kk/standard/FN/content.xml +++ b/extras/source/autotext/lang/kk/standard/FN/content.xml @@ -34,13 +34,13 @@ - + - + formula @@ -52,4 +52,4 @@ - \ No newline at end of file + commit 3173cd99107baac020be9c95bae9def2874de091 Author: Laurent BP AuthorDate: Sat Sep 14 19:04:47 2019 +0200 Commit: Laurent BP CommitDate: Tue Sep 24 21:36:52 2019 +0200 Improve FN AutoText for kab Translate names which appear in Navigator Change-Id: I4ca1a7c5204ae1eb995725ca16a22aeaa23a7ba7 Reviewed-on: https://gerrit.libreoffice.org/78905 Tested-by: Jenkins Reviewed-by: Laurent BP diff --git a/extras/source/autotext/lang/kab/standard/FN/content.xml b/extras/source/autotext/lang/kab/standard/FN/content.xml index b41b40baf853..3b92fc12d9f3 100644 --- a/extras/source/autotext/lang/kab/standard/FN/content.xml +++ b/extras/source/autotext/lang/kab/standard/FN/content.xml @@ -34,13 +34,13 @@ - + - + formula @@ -52,4 +52,4 @@ - \ 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: 2 commits - extras/source
extras/source/autotext/lang/hsb/standard/FN/content.xml |6 +++--- extras/source/autotext/lang/ka/standard/FN/content.xml |6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) New commits: commit 71a9ffb8f776b3dd8a00cbc4c6048426d7529cc8 Author: Laurent BP AuthorDate: Sat Sep 14 19:00:54 2019 +0200 Commit: Laurent BP CommitDate: Tue Sep 24 21:36:22 2019 +0200 Improve FN AutoText for ka Translate names which appear in Navigator Change-Id: If1035ee46c4d7ff0ee014b832420dd64ee784975 Reviewed-on: https://gerrit.libreoffice.org/78904 Tested-by: Jenkins Reviewed-by: Laurent BP diff --git a/extras/source/autotext/lang/ka/standard/FN/content.xml b/extras/source/autotext/lang/ka/standard/FN/content.xml index b41b40baf853..a8be1984de45 100644 --- a/extras/source/autotext/lang/ka/standard/FN/content.xml +++ b/extras/source/autotext/lang/ka/standard/FN/content.xml @@ -34,13 +34,13 @@ - + - + formula @@ -52,4 +52,4 @@ - \ No newline at end of file + commit b888213a81b89b52a6ff3dab4e839555b3a71608 Author: Laurent BP AuthorDate: Sat Sep 14 18:52:55 2019 +0200 Commit: Laurent BP CommitDate: Tue Sep 24 21:35:54 2019 +0200 Improve FN AutoText for hsb Translate names which appear in Navigator Change-Id: I9a278e4428434e41ce972cf56d54f443110f9769 Reviewed-on: https://gerrit.libreoffice.org/78903 Tested-by: Jenkins Reviewed-by: Laurent BP diff --git a/extras/source/autotext/lang/hsb/standard/FN/content.xml b/extras/source/autotext/lang/hsb/standard/FN/content.xml index b41b40baf853..9b087c796603 100644 --- a/extras/source/autotext/lang/hsb/standard/FN/content.xml +++ b/extras/source/autotext/lang/hsb/standard/FN/content.xml @@ -34,13 +34,13 @@ - + - + formula @@ -52,4 +52,4 @@ - \ 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: 2 commits - extras/source
extras/source/autotext/lang/he/standard/FN/content.xml |6 +++--- extras/source/autotext/lang/hi/standard/FN/content.xml |6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) New commits: commit 96f8bae7ac737721c964f6d6a23154931efa4b59 Author: Laurent BP AuthorDate: Sat Sep 14 18:47:03 2019 +0200 Commit: Laurent BP CommitDate: Tue Sep 24 21:35:26 2019 +0200 Improve FN AutoText for hi Translate names which appear in Navigator Change-Id: I125701549657e3a3500985f4cc28dcfd6270d153 Reviewed-on: https://gerrit.libreoffice.org/78902 Tested-by: Jenkins Reviewed-by: Laurent BP diff --git a/extras/source/autotext/lang/hi/standard/FN/content.xml b/extras/source/autotext/lang/hi/standard/FN/content.xml index b41b40baf853..1cd17abb8edf 100644 --- a/extras/source/autotext/lang/hi/standard/FN/content.xml +++ b/extras/source/autotext/lang/hi/standard/FN/content.xml @@ -34,13 +34,13 @@ - + - + formula @@ -52,4 +52,4 @@ - \ No newline at end of file + commit 100f8e03153224fe7273d6c299c5bdcbbb28d68a Author: Laurent BP AuthorDate: Fri Sep 13 23:03:02 2019 +0200 Commit: Laurent BP CommitDate: Tue Sep 24 21:35:04 2019 +0200 Improve FN AutoText for he Translate names which appear in Navigator Change-Id: I1c75b24b47a1dde70146db274b2ad054621e4191 Reviewed-on: https://gerrit.libreoffice.org/78895 Tested-by: Jenkins Reviewed-by: Laurent BP diff --git a/extras/source/autotext/lang/he/standard/FN/content.xml b/extras/source/autotext/lang/he/standard/FN/content.xml index b41b40baf853..6cf50436b8e8 100644 --- a/extras/source/autotext/lang/he/standard/FN/content.xml +++ b/extras/source/autotext/lang/he/standard/FN/content.xml @@ -34,13 +34,13 @@ - + - + formula @@ -52,4 +52,4 @@ - \ 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: 2 commits - extras/source
extras/source/autotext/lang/gl/standard/FN/content.xml |6 +++--- extras/source/autotext/lang/gu/standard/FN/content.xml |6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) New commits: commit e956c3e304c33221b1a7cdf5820ceaed00f3f5ae Author: Laurent BP AuthorDate: Fri Sep 13 22:51:46 2019 +0200 Commit: Laurent BP CommitDate: Tue Sep 24 21:33:43 2019 +0200 Improve FN AutoText for gu Translate names which appear in Navigator Change-Id: I2feb2918cf99c90277eb51c94d0a1e29c0059862 Reviewed-on: https://gerrit.libreoffice.org/78893 Tested-by: Jenkins Reviewed-by: Laurent BP diff --git a/extras/source/autotext/lang/gu/standard/FN/content.xml b/extras/source/autotext/lang/gu/standard/FN/content.xml index b41b40baf853..dc2320acd9da 100644 --- a/extras/source/autotext/lang/gu/standard/FN/content.xml +++ b/extras/source/autotext/lang/gu/standard/FN/content.xml @@ -34,13 +34,13 @@ - + - + formula @@ -52,4 +52,4 @@ - \ No newline at end of file + commit 7315bff2dfae33866e9787e8e3983881aa9ec8e2 Author: Laurent BP AuthorDate: Fri Sep 13 22:47:57 2019 +0200 Commit: Laurent BP CommitDate: Tue Sep 24 21:33:20 2019 +0200 Improve FN AutoText for gl Translate names which appear in Navigator Change-Id: I7408549ffef408422a3335babf23e0cd0dba5e21 Reviewed-on: https://gerrit.libreoffice.org/78892 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos diff --git a/extras/source/autotext/lang/gl/standard/FN/content.xml b/extras/source/autotext/lang/gl/standard/FN/content.xml index b41b40baf853..a13b40d70842 100644 --- a/extras/source/autotext/lang/gl/standard/FN/content.xml +++ b/extras/source/autotext/lang/gl/standard/FN/content.xml @@ -34,13 +34,13 @@ - + - + formula @@ -52,4 +52,4 @@ - \ 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: 2 commits - extras/source
extras/source/autotext/lang/bs/standard/FN/content.xml |6 +++--- extras/source/autotext/lang/ca-valencia/standard/FN/content.xml |6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) New commits: commit 3d54925d73e5c89367ea0d56b08e3087784b5da6 Author: Laurent BP AuthorDate: Fri Sep 13 19:53:46 2019 +0200 Commit: Laurent BP CommitDate: Tue Sep 24 21:24:55 2019 +0200 Improve FN AutoText for ca-valencia Translate names which appear in Navigator Change-Id: Id198377f9e663c6557b5cc50e404fa1d1a1e7b74 Reviewed-on: https://gerrit.libreoffice.org/78880 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos diff --git a/extras/source/autotext/lang/ca-valencia/standard/FN/content.xml b/extras/source/autotext/lang/ca-valencia/standard/FN/content.xml index b41b40baf853..411c9594652b 100644 --- a/extras/source/autotext/lang/ca-valencia/standard/FN/content.xml +++ b/extras/source/autotext/lang/ca-valencia/standard/FN/content.xml @@ -34,13 +34,13 @@ - + - + formula @@ -52,4 +52,4 @@ - \ No newline at end of file + commit 6fad119e8e11b13be618435703f8cd7b87268def Author: Laurent BP AuthorDate: Thu Sep 12 22:26:31 2019 +0200 Commit: Laurent BP CommitDate: Tue Sep 24 21:24:21 2019 +0200 Improve FN AutoText for bs Translate names which appear in Navigator Change-Id: Ie2ef52b3942e7509a5def38bd4de9e80d0340723 Reviewed-on: https://gerrit.libreoffice.org/78854 Tested-by: Jenkins Reviewed-by: Laurent BP diff --git a/extras/source/autotext/lang/bs/standard/FN/content.xml b/extras/source/autotext/lang/bs/standard/FN/content.xml index b41b40baf853..a6fc06fe2f03 100644 --- a/extras/source/autotext/lang/bs/standard/FN/content.xml +++ b/extras/source/autotext/lang/bs/standard/FN/content.xml @@ -34,13 +34,13 @@ - + - + formula @@ -52,4 +52,4 @@ - \ 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: 2 commits - extras/source
extras/source/autotext/lang/bn-IN/standard/FN/content.xml |6 +++--- extras/source/autotext/lang/br/standard/FN/content.xml|6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) New commits: commit ee1df8b8ff120fc672c95d958f7c7d04f40f53ee Author: Laurent BP AuthorDate: Thu Sep 12 22:09:41 2019 +0200 Commit: Laurent BP CommitDate: Tue Sep 24 21:23:15 2019 +0200 Improve FN AutoText for br Translate names which appear in Navigator Change-Id: Ie6baea3382db8411076f8cfc111b839e2d233369 Reviewed-on: https://gerrit.libreoffice.org/78851 Tested-by: Jenkins Reviewed-by: Laurent BP diff --git a/extras/source/autotext/lang/br/standard/FN/content.xml b/extras/source/autotext/lang/br/standard/FN/content.xml index b41b40baf853..288c1b71a2b0 100644 --- a/extras/source/autotext/lang/br/standard/FN/content.xml +++ b/extras/source/autotext/lang/br/standard/FN/content.xml @@ -34,13 +34,13 @@ - + - + formula @@ -52,4 +52,4 @@ - \ No newline at end of file + commit 477b11cba70c5da83afc10ba5147181de59bf4f1 Author: Laurent BP AuthorDate: Thu Sep 12 22:04:12 2019 +0200 Commit: Laurent BP CommitDate: Tue Sep 24 21:22:31 2019 +0200 Improve FN AutoText for bn-IN Translate names which appear in Navigator Change-Id: I2babcb028fdd169e8b256eb0322021970b861899 Reviewed-on: https://gerrit.libreoffice.org/78850 Tested-by: Jenkins Reviewed-by: Laurent BP diff --git a/extras/source/autotext/lang/bn-IN/standard/FN/content.xml b/extras/source/autotext/lang/bn-IN/standard/FN/content.xml index b41b40baf853..a292e49b22e9 100644 --- a/extras/source/autotext/lang/bn-IN/standard/FN/content.xml +++ b/extras/source/autotext/lang/bn-IN/standard/FN/content.xml @@ -34,13 +34,13 @@ - + - + formula @@ -52,4 +52,4 @@ - \ 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: 2 commits - extras/source
extras/source/autotext/lang/bn/standard/FN/content.xml |6 +++--- extras/source/autotext/lang/bo/standard/FN/content.xml |6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) New commits: commit 3f271e8882a83033cddcc306649139df22c462f7 Author: Laurent BP AuthorDate: Thu Sep 12 21:58:50 2019 +0200 Commit: Laurent BP CommitDate: Tue Sep 24 21:22:08 2019 +0200 Improve FN AutoText for bo Translate names which appear in Navigator Change-Id: I0bf22e681f371619eff89a12296efc30b4f7d4ea Reviewed-on: https://gerrit.libreoffice.org/78849 Tested-by: Jenkins Reviewed-by: Laurent BP diff --git a/extras/source/autotext/lang/bo/standard/FN/content.xml b/extras/source/autotext/lang/bo/standard/FN/content.xml index b41b40baf853..a7da775fffa9 100644 --- a/extras/source/autotext/lang/bo/standard/FN/content.xml +++ b/extras/source/autotext/lang/bo/standard/FN/content.xml @@ -34,13 +34,13 @@ - + - + formula @@ -52,4 +52,4 @@ - \ No newline at end of file + commit 0b3cd03c75191c71cc47e1d2d4bc6ebd60d78814 Author: Laurent BP AuthorDate: Thu Sep 12 21:53:35 2019 +0200 Commit: Laurent BP CommitDate: Tue Sep 24 21:21:34 2019 +0200 Improve FN AutoText for bn Translate names which appear in Navigator Change-Id: I409d0945225d594dd3a860b40cdc372f64e35fa3 Reviewed-on: https://gerrit.libreoffice.org/78847 Tested-by: Jenkins Reviewed-by: Laurent BP diff --git a/extras/source/autotext/lang/bn/standard/FN/content.xml b/extras/source/autotext/lang/bn/standard/FN/content.xml index b41b40baf853..a292e49b22e9 100644 --- a/extras/source/autotext/lang/bn/standard/FN/content.xml +++ b/extras/source/autotext/lang/bn/standard/FN/content.xml @@ -34,13 +34,13 @@ - + - + formula @@ -52,4 +52,4 @@ - \ 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: 2 commits - extras/source
extras/source/autotext/lang/ast/standard/FN/content.xml |6 +++--- extras/source/autotext/lang/be/standard/FN/content.xml |6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) New commits: commit fc1c83c372dffd32bade97aa116d7026f5491efe Author: Laurent BP AuthorDate: Thu Sep 12 21:44:20 2019 +0200 Commit: Laurent BP CommitDate: Tue Sep 24 21:21:08 2019 +0200 Improve FN AutoText for be Translate names which appear in Navigator Change-Id: I613c6f62ff68b245e08cf29039146c12a78e80a0 Reviewed-on: https://gerrit.libreoffice.org/78845 Tested-by: Jenkins Reviewed-by: Laurent BP diff --git a/extras/source/autotext/lang/be/standard/FN/content.xml b/extras/source/autotext/lang/be/standard/FN/content.xml index b41b40baf853..10d83a6b7047 100644 --- a/extras/source/autotext/lang/be/standard/FN/content.xml +++ b/extras/source/autotext/lang/be/standard/FN/content.xml @@ -34,13 +34,13 @@ - + - + formula @@ -52,4 +52,4 @@ - \ No newline at end of file + commit f05717bd6123470ce01d37fb712994c94e2042dc Author: Laurent BP AuthorDate: Thu Sep 12 21:37:25 2019 +0200 Commit: Laurent BP CommitDate: Tue Sep 24 21:20:44 2019 +0200 Improve FN AutoText for ast Translate names which appear in Navigator Change-Id: Ie435cb3830cb9ba3e096fb64cb37dec461f647ec Reviewed-on: https://gerrit.libreoffice.org/78844 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos diff --git a/extras/source/autotext/lang/ast/standard/FN/content.xml b/extras/source/autotext/lang/ast/standard/FN/content.xml index b41b40baf853..611a459e748d 100644 --- a/extras/source/autotext/lang/ast/standard/FN/content.xml +++ b/extras/source/autotext/lang/ast/standard/FN/content.xml @@ -34,13 +34,13 @@ - + - + formula @@ -52,4 +52,4 @@ - \ 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: 2 commits - extras/source sfx2/source solenv/bin sw/source sw/uiconfig vcl/source
extras/source/glade/libreoffice-catalog.xml.in |3 sfx2/source/dialog/backingcomp.cxx | 10 + solenv/bin/native-code.py |1 sw/source/ui/dbui/mailmergewizard.cxx |2 sw/source/ui/dbui/mmaddressblockpage.cxx | 201 - sw/source/ui/dbui/mmaddressblockpage.hxx | 59 --- sw/source/uibase/dbui/mailmergehelper.cxx |9 + sw/source/uibase/inc/mailmergehelper.hxx |5 sw/uiconfig/swriter/ui/mmaddressblockpage.ui | 38 vcl/source/control/button.cxx | 10 + vcl/source/window/bufferdevice.cxx |2 vcl/source/window/bufferdevice.hxx |1 vcl/source/window/menubarwindow.cxx| 16 + 13 files changed, 218 insertions(+), 139 deletions(-) New commits: commit b5f2f32defd22c8ec0c47c0100836a8d5bb132ea Author: Caolán McNamara AuthorDate: Thu Aug 22 17:15:44 2019 +0100 Commit: Caolán McNamara CommitDate: Thu Aug 22 20:40:07 2019 +0200 weld SwMailMergeAddressBlockPage Change-Id: Ib3383f1ae590766ecb1371cab2ccdb7c835c95a8 Reviewed-on: https://gerrit.libreoffice.org/77971 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/extras/source/glade/libreoffice-catalog.xml.in b/extras/source/glade/libreoffice-catalog.xml.in index eef7bdd744b6..a86845bd17d1 100644 --- a/extras/source/glade/libreoffice-catalog.xml.in +++ b/extras/source/glade/libreoffice-catalog.xml.in @@ -159,9 +159,6 @@ - diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py index a58a30654a06..45a3fee13118 100755 --- a/solenv/bin/native-code.py +++ b/solenv/bin/native-code.py @@ -512,7 +512,6 @@ custom_widgets = [ 'SvxRelativeField', 'SvxTextEncodingBox', 'SvxTextEncodingBox', -'SwAddressPreview', 'SwNavHelpToolBox', 'TableValueSet', 'TemplateDefaultView', diff --git a/sw/source/ui/dbui/mailmergewizard.cxx b/sw/source/ui/dbui/mailmergewizard.cxx index 49ea7c661fc9..6ca8822cbfc3 100644 --- a/sw/source/ui/dbui/mailmergewizard.cxx +++ b/sw/source/ui/dbui/mailmergewizard.cxx @@ -106,7 +106,7 @@ VclPtr SwMailMergeWizard::createPage(WizardState _nState) SetRoadmapHelpId("modules/swriter/ui/mmoutputtypepage/MMOutputTypePage"); break; case MM_ADDRESSBLOCKPAGE : -pRet = VclPtr::Create(this); +pRet = VclPtr::Create(this, TabPageParent(this)); SetRoadmapHelpId("modules/swriter/ui/mmaddressblockpage/MMAddressBlockPage"); break; case MM_GREETINGSPAGE : diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx index dd12860e54ca..0edb9bddee1f 100644 --- a/sw/source/ui/dbui/mmaddressblockpage.cxx +++ b/sw/source/ui/dbui/mmaddressblockpage.cxx @@ -57,46 +57,46 @@ using namespace ::com::sun::star::sdb; using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::sdbcx; -SwMailMergeAddressBlockPage::SwMailMergeAddressBlockPage( SwMailMergeWizard* _pParent) : -vcl::OWizardPage(_pParent, "MMAddressBlockPage", -"modules/swriter/ui/mmaddressblockpage.ui") -, m_pWizard(_pParent) -{ -get(m_pAddressListPB, "addresslist"); -get(m_pCurrentAddressFI, "currentaddress"); -get(m_pStep2, "step2"); -get(m_pStep3, "step3"); -get(m_pStep4, "step4"); -get(m_pSettingsFI, "settingsft"); -get(m_pAddressCB, "address"); -get(m_pSettingsWIN, "settingspreview"); +SwMailMergeAddressBlockPage::SwMailMergeAddressBlockPage(SwMailMergeWizard* pWizard, TabPageParent pParent) +: vcl::OWizardPage(pParent, "modules/swriter/ui/mmaddressblockpage.ui", "MMAddressBlockPage") +, m_pWizard(pWizard) +, m_xAddressListPB(m_xBuilder->weld_button("addresslist")) +, m_xCurrentAddressFI(m_xBuilder->weld_label("currentaddress")) +, m_xStep2(m_xBuilder->weld_container("step2")) +, m_xStep3(m_xBuilder->weld_container("step3")) +, m_xStep4(m_xBuilder->weld_container("step4")) +, m_xSettingsFI(m_xBuilder->weld_label("settingsft")) +, m_xAddressCB(m_xBuilder->weld_check_button("address")) +, m_xSettingsPB(m_xBuilder->weld_button("settings")) +, m_xHideEmptyParagraphsCB(m_xBuilder->weld_check_button("hideempty")) +, m_xAssignPB(m_xBuilder->weld_button("assign")) +, m_xDocumentIndexFI(m_xBuilder->weld_label("documentindex")) +, m_xPrevSetIB(m_xBuilder->weld_button("prev")) +, m_xNextSetIB(m_xBuilder->weld_button("next")) +, m_xDifferentlist(m_xBuilder->weld_label("differentlist")) +, m_xSettings(new AddressPreview(m_xBuilder->weld_scrolled_window("settingspreviewwin"))) +, m_xPreview(new AddressPreview(m_xBuilder->weld_scrolled_window("addresspreviewwin"))) +, m_xSettingsWIN(new weld::CustomWeld(*m_xBuilder, "settingspreview", *m_xSettings)) +, m_xPreviewWIN(new weld::CustomWeld(*m_xBuilder, "addresspreview", *m_xPreview)) +{
[Libreoffice-commits] core.git: 2 commits - extras/source include/svx svx/inc svx/source sw/inc
extras/source/palettes/material.soc | 52 ++-- include/svx/strings.hrc | 25 + svx/inc/strings.hxx | 26 +- svx/source/unodraw/unoprov.cxx | 48 + sw/inc/IDocumentDeviceAccess.hxx|3 -- 5 files changed, 124 insertions(+), 30 deletions(-) New commits: commit 16006492d6b1e26fdb13176b9a5ed74e4048218b Author: Kovács László Zoltán AuthorDate: Tue Aug 13 15:46:56 2019 +0200 Commit: László Németh CommitDate: Wed Aug 21 15:02:43 2019 +0200 tdf#105000 Make Material palette entries localizable Change-Id: I8e208ed6b807e43ce53c5604ccb5d544c28189e5 Reviewed-on: https://gerrit.libreoffice.org/77419 Reviewed-by: Gabor Kelemen Reviewed-by: László Németh Tested-by: László Németh diff --git a/extras/source/palettes/material.soc b/extras/source/palettes/material.soc index e06d4a7cadd5..c5f8823f2e8b 100644 --- a/extras/source/palettes/material.soc +++ b/extras/source/palettes/material.soc @@ -3,19 +3,19 @@ http://openoffice.org/2000/office"; xmlns:style="http://openoffice.org/2000/style"; xmlns:text="http://openoffice.org/2000/text"; xmlns:table="http://openoffice.org/2000/table"; xmlns:draw="http://openoffice.org/2000/drawing"; xmlns:fo="http://www.w3.org/1999/XSL/Format"; xmlns:xlink="http://www.w3.org/1999/xlink"; xmlns:dc="http://purl.org/dc/elements/1.1/"; xmlns:meta="http://openoffice.org/2000/meta"; xmlns:number="http://openoffice.org/2000/datastyle"; xmlns:svg="http://www.w3.org/2000/svg"; xmlns:chart="http://openoffice.org/2000/chart"; xmlns:dr3d="http://openoffice.org/2000/dr3d"; xmlns:math="http://www.w3.org/1998/Math/MathML"; xmlns:form="http://openoffice.org/2000/form"; xmlns:script="http://openoffice.org/2000/script";> - - - - - - - - - - - - - + + + + + + + + + + + + + @@ -255,17 +255,17 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/include/svx/strings.hrc b/include/svx/strings.hrc index 6690d18a2b48..3f762edf5e3b 100644 --- a/include/svx/strings.hrc +++ b/include/svx/strings.hrc @@ -619,6 +619,31 @@ #define RID_SVXSTR_COLOR_SPRINGGREEN NC_("RID_SVXSTR_COLOR_SPRINGGREEN", "Spring Green") #define RID_SVXSTR_COLOR_CHARTREUSEGREEN NC_("RID_SVXSTR_COLOR_CHARTREUSEGREEN", "Chartreuse Green") #define RID_SVXSTR_COLOR_ROSE NC_("RID_SVXSTR_COLOR_ROSE", "Rose") +//Elements of the Material color palette +#define RID_SVXSTR_COLOR_MATERIAL_GRAY_A NC_("RID_SVXSTR_COLOR_MATERIAL_GRAY_A", "Gray A") +#define RID_SVXSTR_COLOR_MATERIAL_YELLOW_A NC_("RID_SVXSTR_COLOR_MATERIAL_YELLOW_A", "Yellow A") +#define RID_SVXSTR_COLOR_MATERIAL_AMBER_A NC_("RID_SVXSTR_COLOR_MATERIAL_AMBER_A", "Amber A") +#define RID_SVXSTR_COLOR_MATERIAL_AMBER NC_("RID_SVXSTR_COLOR_MATERIAL_AMBER", "Amber") +#define RID_SVXSTR_COLOR_MATERIAL_ORANGE_A NC_("RID_SVXSTR_COLOR_MATERIAL_ORANGE_A", "Orange A") +#define RID_SVXSTR_COLOR_MATERIAL_DEEP_ORANGE_A NC_("RID_SVXSTR_COLOR_MATERIAL_DEEP_ORANGE_A", "Deep Orange A") +#define RID_SVXSTR_COLOR_MATERIAL_DEEP_ORANGE NC_("RID_SVXSTR_COLOR_MATERIAL_DEEP_ORANGE", "Deep Orange") +#define RID_SVXSTR_COLOR_MATERIAL_RED_A NC_("RID_SVXSTR_COLOR_MATERIAL_RED_A", "Red A") +#define RID_SVXSTR_COLOR_MATERIAL_PINK_A NC_("RID_SVXSTR_COLOR_MATERIAL_PINK_A", "Pink A") +#define RID_SVXSTR_COLOR_MATERIAL_PURPLE_A NC_("RID_SVXSTR_COLOR_MATERIAL_PURPLE_A", "Purple A") +#define RID_SVXSTR_COLOR_MATERIAL_DEEP_PURPLE_A NC_("RID_SVXSTR_COLOR_MATERIAL_DEEP_PURPLE_A", "Deep Purple A") +#define RID_SVXSTR_COLOR_MATERIAL_DEEP_PURPLE NC_("RID_SVXSTR_COLOR_MATERIAL_DEEP_PURPLE", "Deep Purple") +#define RID_SVXSTR_COLOR_MATERIAL_INDIGO_A NC_("RID_SVXSTR_COLOR_MATERIAL_INDIGO_A", "Indigo A") +#define RID_SVXSTR_COLOR_MATERIAL_BLUE_A NC_("RID_SVXSTR_COLOR_MATERIAL_BLUE_A", "Blue A") +#define RID_SVXSTR_COLOR_MATERIAL_LIGHT_BLUE_A NC_("RID_SVXSTR_COLOR_MATERIAL_LIGHT_BLUE_A", "Light Blue A") +#define RID_SVXSTR_COLOR_MATERIAL_CYAN_A NC_("RID_SVXSTR_COLOR_MATERIAL_CYAN_A", "Cyan A") +#define RID_SVXSTR_COLOR_MATERIAL_TEAL_A NC_("RID_SVXSTR_COLOR_MATERIAL_TEAL_A", "Teal A") +#define RID_SVXSTR_COLOR_MATERIAL_GREEN_A NC_("RID_SVXSTR_COLOR_MATERIAL_GREEN_A", "Green A") +#define RID_SVXSTR_COLOR_MATERIAL_LIGHT_GREEN_A NC_("RID_SVXSTR_COLOR_MATERIAL_LIGHT_GREEN_A", "Light Green A") +#define RID_SVXSTR_COLOR_MATERIAL_LIME_A NC_("RID_SVXSTR_COLOR_MATERIAL_LIME_A", "Lime A") +#d
[Libreoffice-commits] core.git: 2 commits - extras/source sc/source sc/uiconfig solenv/bin
extras/source/glade/libreoffice-catalog.xml.in |4 sc/source/ui/cctrl/editfield.cxx | 32 --- sc/source/ui/inc/editfield.hxx | 11 - sc/source/ui/inc/tpcalc.hxx| 54 +++--- sc/source/ui/optdlg/tpcalc.cxx | 211 ++--- sc/uiconfig/scalc/ui/optcalculatepage.ui | 21 +- solenv/bin/native-code.py |1 7 files changed, 128 insertions(+), 206 deletions(-) New commits: commit a26c59ddccc527239f53dadd1db04d34231b310d Author: Caolán McNamara AuthorDate: Mon Jul 29 12:00:33 2019 +0100 Commit: Caolán McNamara CommitDate: Mon Jul 29 20:27:56 2019 +0200 drop newly unused ScDoubleField Change-Id: I2105306d1d865512a5fa2f8c862e7a21c384ee39 Reviewed-on: https://gerrit.libreoffice.org/76545 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/sc/source/ui/cctrl/editfield.cxx b/sc/source/ui/cctrl/editfield.cxx index 0e6b55747e3b..4066ec4b5e3a 100644 --- a/sc/source/ui/cctrl/editfield.cxx +++ b/sc/source/ui/cctrl/editfield.cxx @@ -24,7 +24,6 @@ #include #include #include -#include #include namespace { @@ -36,37 +35,6 @@ sal_Unicode lclGetDecSep() } // namespace -ScDoubleField::ScDoubleField( vcl::Window* pParent, WinBits nStyle ) : -Edit( pParent, nStyle ) -{ -} - -extern "C" SAL_DLLPUBLIC_EXPORT void makeScDoubleField(VclPtr & rRet, VclPtr & pParent, VclBuilder::stringmap & rMap) -{ -BuilderUtils::ensureDefaultWidthChars(rMap); -rRet = VclPtr::Create(pParent, WB_LEFT|WB_VCENTER|WB_BORDER|WB_3DLOOK); -} - -bool ScDoubleField::GetValue( double& rfValue ) const -{ -OUString aStr(comphelper::string::strip(GetText(), ' ')); -bool bOk = !aStr.isEmpty(); -if( bOk ) -{ -rtl_math_ConversionStatus eStatus; -sal_Int32 nEnd; -rfValue = ScGlobal::GetpLocaleData()->stringToDouble( aStr, true, &eStatus, &nEnd ); -bOk = (eStatus == rtl_math_ConversionStatus_Ok) && (nEnd == aStr.getLength() ); -} -return bOk; -} - -void ScDoubleField::SetValue( double fValue, sal_Int32 nDecPlaces ) -{ -SetText( ::rtl::math::doubleToUString( fValue, rtl_math_StringFormat_G, -nDecPlaces, lclGetDecSep(), true/*bEraseTrailingDecZeros*/ ) ); -} - DoubleField::DoubleField(std::unique_ptr xEntry) : m_xEntry(std::move(xEntry)) { diff --git a/sc/source/ui/inc/editfield.hxx b/sc/source/ui/inc/editfield.hxx index e64b79e305ef..ce6e9a9ac027 100644 --- a/sc/source/ui/inc/editfield.hxx +++ b/sc/source/ui/inc/editfield.hxx @@ -24,16 +24,6 @@ #include /** An edit control that contains a double precision floating-point value. */ -class ScDoubleField : public Edit -{ -public: -explicitScDoubleField( vcl::Window* pParent, WinBits nStyle ); - -boolGetValue( double& rfValue ) const; -voidSetValue( double fValue, - sal_Int32 nDecPlaces = 12 ); -}; - class DoubleField { private: commit b4550772ca34b752bd68a5fe2fc0971741c79ee3 Author: Caolán McNamara AuthorDate: Mon Jul 29 11:59:09 2019 +0100 Commit: Caolán McNamara CommitDate: Mon Jul 29 20:27:45 2019 +0200 weld ScTpCalcOptions Change-Id: I4b5bd08a9ed04b9bceb08640a275dee02d6e9b36 Reviewed-on: https://gerrit.libreoffice.org/76544 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/extras/source/glade/libreoffice-catalog.xml.in b/extras/source/glade/libreoffice-catalog.xml.in index dff39e5a6c9d..c76f9de0ca50 100644 --- a/extras/source/glade/libreoffice-catalog.xml.in +++ b/extras/source/glade/libreoffice-catalog.xml.in @@ -239,10 +239,6 @@ - - diff --git a/sc/source/ui/inc/editfield.hxx b/sc/source/ui/inc/editfield.hxx index a1edbf6baead..e64b79e305ef 100644 --- a/sc/source/ui/inc/editfield.hxx +++ b/sc/source/ui/inc/editfield.hxx @@ -48,6 +48,7 @@ public: void grab_focus() { m_xEntry->grab_focus(); } bool get_sensitive() const { return m_xEntry->get_sensitive(); } +void set_sensitive(bool bSensitive) { m_xEntry->set_sensitive(bSensitive); } }; #endif diff --git a/sc/source/ui/inc/tpcalc.hxx b/sc/source/ui/inc/tpcalc.hxx index 31d5d6f3c62e..6d1fb5d06bea 100644 --- a/sc/source/ui/inc/tpcalc.hxx +++ b/sc/source/ui/inc/tpcalc.hxx @@ -40,46 +40,44 @@ public: virtual DeactivateRC DeactivatePage ( SfxItemSet* pSet ) override; private: -ScTpCalcOptions( vcl::Window*pParent, - const SfxItemSet& rCoreSet ); -virtual ~ScTpCalcOptions() override; -virtual void dispose() override; +ScTpCalcOptions(TabPageParent pParent, const SfxItemSet& rCoreSet); +virtual ~ScTpCalcOptions() override; private: -VclPtr m_pBtnIterate; -VclPtr m_pFtSteps; -VclPtr m_pEdSteps; -VclPtr m_pFtEps; -
[Libreoffice-commits] core.git: 2 commits - extras/source formula/source formula/uiconfig include/formula include/vcl reportdesign/source sc/source solenv/bin solenv/sanitizers vcl/source vcl/unx xmls
extras/source/glade/libreoffice-catalog.xml.in | 10 formula/source/ui/dlg/ControlHelper.hxx| 82 - formula/source/ui/dlg/formula.cxx | 974 ++--- formula/source/ui/dlg/funcpage.cxx | 173 +-- formula/source/ui/dlg/funcpage.hxx | 45 formula/source/ui/dlg/funcutl.cxx | 243 + formula/source/ui/dlg/parawin.cxx | 218 ++-- formula/source/ui/dlg/parawin.hxx | 80 - formula/source/ui/dlg/structpg.cxx | 126 +- formula/source/ui/dlg/structpg.hxx | 40 formula/uiconfig/ui/formuladialog.ui | 103 +- formula/uiconfig/ui/functionpage.ui| 49 - formula/uiconfig/ui/parameter.ui | 489 -- formula/uiconfig/ui/structpage.ui | 51 - include/formula/formdata.hxx |3 include/formula/formula.hxx| 33 include/formula/funcutl.hxx|4 include/vcl/weld.hxx |8 reportdesign/source/ui/dlg/Formula.cxx | 15 reportdesign/source/ui/inc/Formula.hxx |3 reportdesign/source/ui/misc/UITools.cxx|9 sc/source/ui/formdlg/formula.cxx | 17 sc/source/ui/inc/formula.hxx |9 sc/source/ui/view/reffact.cxx |4 sc/source/ui/view/tabvwshc.cxx | 14 solenv/bin/native-code.py |3 solenv/sanitizers/ui/formula.suppr |2 vcl/source/app/salvtables.cxx | 28 vcl/unx/gtk3/gtk3gtkinst.cxx | 184 ++- xmlsecurity/uiconfig/ui/digitalsignaturesdialog.ui |1 30 files changed, 1461 insertions(+), 1559 deletions(-) New commits: commit feecbabd01870ed83a04baa6cb13d7a8af832ac3 Author: Caolán McNamara AuthorDate: Wed May 1 15:46:06 2019 +0100 Commit: Caolán McNamara CommitDate: Tue May 7 13:08:13 2019 +0200 weld FormulaDialog drop xFocusWin hack, I don't see what gain it gives Change-Id: I31952b5440797e6209ed1de6b546f1e4c0238d08 Reviewed-on: https://gerrit.libreoffice.org/71675 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/extras/source/glade/libreoffice-catalog.xml.in b/extras/source/glade/libreoffice-catalog.xml.in index 50b8118b0b91..5cc174b9ab3a 100644 --- a/extras/source/glade/libreoffice-catalog.xml.in +++ b/extras/source/glade/libreoffice-catalog.xml.in @@ -287,9 +287,6 @@ - - - - diff --git a/formula/source/ui/dlg/ControlHelper.hxx b/formula/source/ui/dlg/ControlHelper.hxx index a5f975d64b65..8ec7d504279e 100644 --- a/formula/source/ui/dlg/ControlHelper.hxx +++ b/formula/source/ui/dlg/ControlHelper.hxx @@ -24,58 +24,28 @@ namespace formula { -// class EditBox -class EditBox : public Control -{ -private: - -VclPtr pMEdit; -LinkaSelChangedLink; -Selection aOldSel; - -DECL_LINK(ChangedHdl, void *, void); - -protected: - -virtual boolPreNotify( NotifyEvent& rNEvt ) override; -virtual voidResize() override; -virtual voidGetFocus() override; - - -public: -EditBox( vcl::Window* pParent, WinBits nBits ); - -virtual ~EditBox() override; -virtual voiddispose() override; - -MultiLineEdit* GetEdit() {return pMEdit;} - -voidSetSelChangedHdl( const Link& rLink ) { aSelChangedLink = rLink; } - -voidUpdateOldSel(); -}; - +class ParaWin; // class ArgEdit -class ArgEdit : public RefEdit +class ArgEdit : public WeldRefEdit { public: -ArgEdit( vcl::Window* pParent, WinBits nBits ); -virtual ~ArgEdit() override; -virtual void dispose() override; +ArgEdit(std::unique_ptr xControl); -voidInit( ArgEdit* pPrevEdit, ArgEdit* pNextEdit, - ScrollBar& rArgSlider, sal_uInt16 nArgCount ); +voidInit(ArgEdit* pPrevEdit, ArgEdit* pNextEdit, + weld::ScrolledWindow& rArgSlider, + ParaWin& rParaWin, sal_uInt16 nArgCount); protected: -virtual voidKeyInput( const KeyEvent& rKEvt ) override; +DECL_LINK(KeyInputHdl, const KeyEvent&, bool); private: -VclPtrpEdPrev; -VclPtrpEdNext; -VclPtr pSlider; -sal_uInt16 nArgs; +ArgEdit* pEdPrev; +ArgEdit* pEdNext; +weld::ScrolledWindow* pSlider; +ParaWin* pParaWin; +sal_uInt16 nArgs; }; @@ -89,24 +59,24 @@ private: Link aEdFocusLink; Link aEdModifyLink; -VclPtr pFtArg; -VclPtr pBtnFx; -VclPtrpEdArg; -VclPtr pRefBtn; +weld::Label*pFtArg; +weld::Button* pBtnFx; +ArgEdit* pEdArg; +WeldRefButton* pRefBtn; -DECL_LIN
[Libreoffice-commits] core.git: 2 commits - extras/source sc/inc sc/qa sc/source sc/uiconfig solenv/bin sw/source sw/uiconfig
extras/source/glade/libreoffice-catalog.xml.in |7 sc/inc/scabstdlg.hxx |2 sc/qa/uitest/calc_tests6/autoFormat.py | 10 sc/source/ui/attrdlg/scdlgfact.cxx | 17 sc/source/ui/attrdlg/scdlgfact.hxx | 10 sc/source/ui/inc/autofmt.hxx | 12 sc/source/ui/inc/scuiautofmt.hxx | 49 +- sc/source/ui/miscdlgs/autofmt.cxx | 40 - sc/source/ui/miscdlgs/scuiautofmt.cxx | 215 -- sc/source/ui/view/cellsh3.cxx |4 sc/uiconfig/scalc/ui/autoformattable.ui| 235 ++- solenv/bin/native-code.py |2 sw/source/ui/fldui/flddinf.cxx |6 sw/source/ui/fldui/flddinf.hxx |1 sw/source/ui/fldui/fldfunc.cxx | 515 +++-- sw/source/ui/fldui/fldfunc.hxx | 82 +-- sw/source/ui/fldui/fldpage.cxx | 38 + sw/source/ui/fldui/fldpage.hxx |5 sw/source/uibase/cctrl/actctrl.cxx | 19 sw/source/uibase/inc/actctrl.hxx | 15 sw/source/uibase/inc/condedit.hxx |4 sw/uiconfig/swriter/ui/fldfuncpage.ui | 232 ++- 22 files changed, 778 insertions(+), 742 deletions(-) New commits: commit 43fd682ea227bbe82f0abf756213cf88b2826183 Author: Caolán McNamara AuthorDate: Sat Mar 16 17:58:16 2019 + Commit: Caolán McNamara CommitDate: Sat Mar 16 22:17:19 2019 +0100 weld SwFieldFuncPage Change-Id: I5b098eecb7318ab64dcafff3ce1ef0fa34536f50 Reviewed-on: https://gerrit.libreoffice.org/69346 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/extras/source/glade/libreoffice-catalog.xml.in b/extras/source/glade/libreoffice-catalog.xml.in index d1583ef900ef..5af0548a670c 100644 --- a/extras/source/glade/libreoffice-catalog.xml.in +++ b/extras/source/glade/libreoffice-catalog.xml.in @@ -365,10 +365,6 @@ generic-name="Condition Edit" parent="GtkEntry" icon-name="widget-gtk-textentry"/> - - diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py index 506ac91d760a..88942fe07037 100755 --- a/solenv/bin/native-code.py +++ b/solenv/bin/native-code.py @@ -465,7 +465,6 @@ custom_widgets = [ 'RefButton', 'RefEdit', 'ReplaceEdit', -'ReturnActionEdit', 'RowEdit', 'RubyEdit', 'RubyPreview', diff --git a/sw/source/ui/fldui/flddinf.cxx b/sw/source/ui/fldui/flddinf.cxx index c412a4045e0a..13659f395655 100644 --- a/sw/source/ui/fldui/flddinf.cxx +++ b/sw/source/ui/fldui/flddinf.cxx @@ -52,6 +52,12 @@ void FillFieldSelect(ListBox& rListBox) rListBox.InsertEntry(SwResId(FLD_SELECT[i])); } +void FillFieldSelect(weld::TreeView& rListBox) +{ +for (size_t i = 0; i < SAL_N_ELEMENTS(FLD_SELECT); ++i) +rListBox.append_text(SwResId(FLD_SELECT[i])); +} + SwFieldDokInfPage::SwFieldDokInfPage(vcl::Window* pParent, const SfxItemSet *const pCoreSet) : SwFieldPage(pParent, "FieldDocInfoPage", "modules/swriter/ui/flddocinfopage.ui", pCoreSet) diff --git a/sw/source/ui/fldui/flddinf.hxx b/sw/source/ui/fldui/flddinf.hxx index 2347a6d15611..d583f53fd88e 100644 --- a/sw/source/ui/fldui/flddinf.hxx +++ b/sw/source/ui/fldui/flddinf.hxx @@ -72,6 +72,7 @@ public: }; void FillFieldSelect(ListBox& rListBox); +void FillFieldSelect(weld::TreeView& rListBox); #endif diff --git a/sw/source/ui/fldui/fldfunc.cxx b/sw/source/ui/fldui/fldfunc.cxx index 92bcf82a5a52..9c18d44126b2 100644 --- a/sw/source/ui/fldui/fldfunc.cxx +++ b/sw/source/ui/fldui/fldfunc.cxx @@ -38,58 +38,52 @@ using namespace ::com::sun::star; -SwFieldFuncPage::SwFieldFuncPage(vcl::Window* pParent, const SfxItemSet *const pCoreSet) -: SwFieldPage(pParent, "FieldFuncPage", -"modules/swriter/ui/fldfuncpage.ui", pCoreSet) +SwFieldFuncPage::SwFieldFuncPage(TabPageParent pParent, const SfxItemSet *const pCoreSet) +: SwFieldPage(pParent, "modules/swriter/ui/fldfuncpage.ui", "FieldFuncPage", pCoreSet) , nOldFormat(0) , bDropDownLBChanged(false) +, m_xTypeLB(m_xBuilder->weld_tree_view("type")) +, m_xSelectionLB(m_xBuilder->weld_tree_view("select")) +, m_xFormat(m_xBuilder->weld_widget("formatframe")) +, m_xFormatLB(m_xBuilder->weld_tree_view("format")) +, m_xNameFT(m_xBuilder->weld_label("nameft")) +, m_xNameED(new SwConditionEdit(m_xBuilder->weld_entry("condFunction"))) +, m_xValueGroup(m_xBuilder->weld_widget("valuegroup")) +, m_xValueFT(m_xBuilder->weld_label("valueft")) +, m_xValueED(m_xBuilder->weld_entry("value")) +, m_xCond1FT(m_xBuilder->weld_label("cond1ft")) +, m_xCond1ED(new SwConditionEdit(m_xBuilder->weld_entry("cond1"))) +, m_xCond2FT(m_xBuilder->weld_label("cond2ft")) +, m_xCond2ED(new SwConditionEdit(m_xBuilder->we
[Libreoffice-commits] core.git: 2 commits - extras/source starmath/inc starmath/source starmath/uiconfig svx/source
extras/source/glade/libreoffice-catalog.xml.in |6 starmath/inc/dialog.hxx| 110 +++ starmath/source/dialog.cxx | 350 + starmath/source/view.cxx |3 starmath/uiconfig/smath/ui/catalogdialog.ui| 122 +--- starmath/uiconfig/smath/ui/symdefinedialog.ui |4 svx/source/dialog/charmap.cxx |2 7 files changed, 262 insertions(+), 335 deletions(-) New commits: commit a0329f7c60b457405058404dececd4d8479ef1d5 Author: Caolán McNamara Date: Sun Apr 29 15:27:31 2018 +0100 weld SmSymbolDialog Change-Id: I163a309fdf79e3eeadeb15b2a1c042666def339f Reviewed-on: https://gerrit.libreoffice.org/53633 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/extras/source/glade/libreoffice-catalog.xml.in b/extras/source/glade/libreoffice-catalog.xml.in index fcb9c7c7b497..22b33767161b 100644 --- a/extras/source/glade/libreoffice-catalog.xml.in +++ b/extras/source/glade/libreoffice-catalog.xml.in @@ -251,18 +251,12 @@ - - diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx index 3a63fb264f7a..e2a66edba2c7 100644 --- a/starmath/inc/dialog.hxx +++ b/starmath/inc/dialog.hxx @@ -258,91 +258,70 @@ public: /**/ -class SmShowSymbolSetWindow : public Control +class SmShowSymbolSet { -VclPtr m_pVScrollBar; +Size m_aSize; +Size m_aOldSize; SymbolPtrVec_t aSymbolSet; -Link aSelectHdlLink; -Link aDblClickHdlLink; +Link aSelectHdlLink; +Link aDblClickHdlLink; longnLen; longnRows, nColumns; longnXOffset, nYOffset; sal_uInt16 nSelectSymbol; +std::unique_ptr m_xDrawingArea; +std::unique_ptr m_xScrolledWindow; void SetScrollBarRange(); Point OffsetPoint(const Point &rPoint) const; -virtual voidPaint(vcl::RenderContext& rRenderContext, const tools::Rectangle&) override; -virtual voidMouseButtonDown(const MouseEvent& rMEvt) override; -virtual voidKeyInput(const KeyEvent& rKEvt) override; -virtual voidResize() override; -virtual SizeGetOptimalSize() const override; +DECL_LINK(DoPaint, weld::DrawingArea::draw_args, void); +DECL_LINK(DoMouseButtonDown, const MouseEvent& rMEvt, void); +DECL_LINK(DoKeyDown, const KeyEvent& rKEvt, bool); +DECL_LINK(DoResize, const Size& rSize, void); +DECL_LINK(ScrollHdl, weld::ScrolledWindow&, void); -DECL_LINK( ScrollHdl, ScrollBar*, void ); public: -SmShowSymbolSetWindow(vcl::Window *pParent, WinBits nStyle); -virtual ~SmShowSymbolSetWindow() override; -virtual void dispose() override; -void setScrollbar(ScrollBar *pVScrollBar); -void calccols(); +SmShowSymbolSet(weld::DrawingArea* pDrawingArea, weld::ScrolledWindow* pScrolledWindow); +void calccols(vcl::RenderContext& rRenderContext); voidSelectSymbol(sal_uInt16 nSymbol); sal_uInt16 GetSelectSymbol() const { return nSelectSymbol; } void SetSymbolSet(const SymbolPtrVec_t& rSymbolSet); -void SetSelectHdl(const Link& rLink) { aSelectHdlLink = rLink; } -void SetDblClickHdl(const Link& rLink) { aDblClickHdlLink = rLink; } +void SetSelectHdl(const Link& rLink) { aSelectHdlLink = rLink; } +void SetDblClickHdl(const Link& rLink) { aDblClickHdlLink = rLink; } }; -class SmShowSymbolSet : public VclHBox +class SmShowSymbol { -VclPtr aSymbolWindow; -VclPtr aVScrollBar; - -public: -SmShowSymbolSet(vcl::Window *pParent); -virtual ~SmShowSymbolSet() override; -virtual void dispose() override; - -voidSetSymbolSet(const SymbolPtrVec_t& rSymbolSet) { aSymbolWindow->SetSymbolSet(rSymbolSet); } - -voidSelectSymbol(sal_uInt16 nSymbol) { aSymbolWindow->SelectSymbol(nSymbol); } -sal_uInt16 GetSelectSymbol() const { return aSymbolWindow->GetSelectSymbol(); } - -void SetSelectHdl(const Link& rLink) { aSymbolWindow->SetSelectHdl(rLink); } -void SetDblClickHdl(const Link& rLink) { aSymbolWindow->SetDblClickHdl(rLink); } -}; - +private: +Size m_aSize; +vcl::Font m_aFont; +OUString m_aText; +std::unique_ptr m_xDrawingArea; -class SmShowSymbol : public Control -{ Link aDblClickHdlLink; -virtual voidPaint(vcl::RenderContext& rRenderContext, const tools::Rectangle&) override; -virtual voidApplySettings(vcl::RenderContext& rRenderContext) override; -virtual voidMouseButtonDown(const MouseEvent& rMEvt) override; -virtual voidResize() override; +DECL_LINK(DoPaint, weld::DrawingArea::draw_args, void); +DECL_LINK(DoMouseButtonDown, const MouseEvent& rMEvt, void); +DECL_LINK(DoResize, const Size& rSize, void); void setFontSize(vcl::Font &rFont) const; public: -SmShowSymbol(vcl::Window *pPare
[Libreoffice-commits] core.git: 2 commits - extras/source include/svx sc/source sw/inc sw/source
extras/source/misc_config/autotbl.fmt |binary include/svx/strings.hrc | 12 sc/source/core/tool/autoform.cxx| 12 sw/inc/poolfmt.hxx | 12 sw/inc/strings.hrc | 18 -- sw/source/core/doc/DocumentStylePoolManager.cxx | 63 sw/source/core/doc/SwStyleNameMapper.cxx| 13 7 files changed, 93 insertions(+), 37 deletions(-) New commits: commit b56cd8050137ed4555a5aca50d4949d941e1f132 Author: Eike Rathke Date: Wed Nov 29 23:54:26 2017 +0100 Prepare for translated new AutoFormat Table Styles, tdf#101349 Stored in file are resource IDs for predefined style names, user defined styles are stored with ID 0x and display the given name. The 16 old styles have IDs 0..15, so add strings for the 10 new styles and append those to the already existing IDs assigning them the range 16..25 Once the final autotbl.fmt file with only new styles will be available, patch that to change the 0x user defined to those 16..25 (0x10 to 0x19) IDs, it is the uint16 immediately following the style name (Little Endian). Order of styles should match the one in this change, if not, change the change.. Also, this eliminates the duplicated translation entries in sw/inc/strings.hrc and instead in sw/source/core/doc/DocumentStylePoolManager.cxx pulls the translations from include/svx/strings.hrc Change-Id: I7827ae22ab05901e6580ff1b9cd812db55f94f7f Reviewed-on: https://gerrit.libreoffice.org/45544 Tested-by: Jenkins Reviewed-by: Eike Rathke diff --git a/include/svx/strings.hrc b/include/svx/strings.hrc index 048cdc6c681e..2aad6c092bdc 100644 --- a/include/svx/strings.hrc +++ b/include/svx/strings.hrc @@ -640,6 +640,7 @@ #define RID_SVXSTR_COLOR_YELLOWGREEN NC_("RID_SVXSTR_COLOR_YELLOWGREEN", "Yellow green") #define RID_SVXSTR_COLOR_PINK NC_("RID_SVXSTR_COLOR_PINK", "Pink") #define RID_SVXSTR_COLOR_TURQUOISE NC_("RID_SVXSTR_COLOR_TURQUOISE", "Turquoise") +/* 16 old AutoFormat Table Styles */ #define RID_SVXSTR_TBLAFMT_3D NC_("RID_SVXSTR_TBLAFMT_3D", "3D") #define RID_SVXSTR_TBLAFMT_BLACK1 NC_("RID_SVXSTR_TBLAFMT_BLACK1", "Black 1") #define RID_SVXSTR_TBLAFMT_BLACK2 NC_("RID_SVXSTR_TBLAFMT_BLACK2", "Black 2") @@ -656,6 +657,17 @@ #define RID_SVXSTR_TBLAFMT_RED NC_("RID_SVXSTR_TBLAFMT_RED", "Red") #define RID_SVXSTR_TBLAFMT_TURQUOISE NC_("RID_SVXSTR_TBLAFMT_TURQUOISE", "Turquoise") #define RID_SVXSTR_TBLAFMT_YELLOW NC_("RID_SVXSTR_TBLAFMT_YELLOW", "Yellow") +/* 10 new AutoFormat Table Styles since LibreOffice 6.0 */ +#define RID_SVXSTR_TBLAFMT_LO6_ACADEMIC NC_("RID_SVXSTR_TBLAFMT_LO6_ACADEMIC", "Academic") +#define RID_SVXSTR_TBLAFMT_LO6_BOX_LIST_BLUE NC_("RID_SVXSTR_TBLAFMT_LO6_BOX_LIST_BLUE", "Box List Blue") +#define RID_SVXSTR_TBLAFMT_LO6_BOX_LIST_GREEN NC_("RID_SVXSTR_TBLAFMT_LO6_BOX_LIST_GREEN", "Box List Green") +#define RID_SVXSTR_TBLAFMT_LO6_BOX_LIST_RED NC_("RID_SVXSTR_TBLAFMT_LO6_BOX_LIST_RED", "Box List Red") +#define RID_SVXSTR_TBLAFMT_LO6_BOX_LIST_YELLOW NC_("RID_SVXSTR_TBLAFMT_LO6_BOX_LIST_YELLOW", "Box List Yellow") +#define RID_SVXSTR_TBLAFMT_LO6_ELEGANT NC_("RID_SVXSTR_TBLAFMT_LO6_ELEGANT", "Elegant") +#define RID_SVXSTR_TBLAFMT_LO6_FINANCIAL NC_("RID_SVXSTR_TBLAFMT_LO6_FINANCIAL", "Financial") +#define RID_SVXSTR_TBLAFMT_LO6_SIMPLE_GRID_COLUMNS NC_("RID_SVXSTR_TBLAFMT_LO6_SIMPLE_GRID_COLUMNS", "Simple Grid Columns") +#define RID_SVXSTR_TBLAFMT_LO6_SIMPLE_GRID_ROWS NC_("RID_SVXSTR_TBLAFMT_LO6_SIMPLE_GRID_ROWS", "Simple Grid Rows") +#define RID_SVXSTR_TBLAFMT_LO6_SIMPLE_LIST_SHADED NC_("RID_SVXSTR_TBLAFMT_LO6_SIMPLE_LIST_SHADED", "Simple List Shaded") #define RID_SVXSTR_LINEJOINT_MIDDLE NC_("RID_SVXSTR_LINEJOINT_MIDDLE", "Line joint averaged") #define RID_SVXSTR_LINEJOINT_BEVEL NC_("RID_SVXSTR_LINEJOINT_BEVEL", "Line joint bevel") #define RID_SVXSTR_LINEJOINT_MITER NC_("RID_SVXSTR_LINEJOINT_MITER", "Line joint miter") diff --git a/sc/source/core/tool/autoform.cxx b/sc/source/core/tool/autoform.cxx index 296dae5b9026..371cf8c2347f 100644 --- a/sc/source/core/tool/autoform.cxx +++ b/sc/source/core/tool/autoform.cxx @@ -762,7 +762,17 @@ static const char* RID_SVXSTR_TBLAFMT[] = RID_SVXSTR_TBLAFMT_LAVENDER, RID_SVXSTR_TBLAFMT_RED, RID_SVXSTR_TBLAFMT_TURQUOISE, -RID_SVXSTR_TBLAFMT_YELLOW +RID_SVXSTR_TBLAFMT_YELLOW, +RID_SVXSTR_TBLAFMT_LO6_ACADEM
[Libreoffice-commits] core.git: 2 commits - extras/source vcl/source
extras/source/truetype/symbol/README |6 +++--- vcl/source/gdi/CommonSalLayout.cxx | 10 ++ 2 files changed, 9 insertions(+), 7 deletions(-) New commits: commit 7a072614b234529d24515464c3f6575bb33480e5 Author: Khaled Hosny Date: Sat Nov 19 15:35:59 2016 +0200 Typos Change-Id: Iff293841047a945107033ed81d4e81fb8bbe67b8 diff --git a/extras/source/truetype/symbol/README b/extras/source/truetype/symbol/README index b69b721..80d8975 100644 --- a/extras/source/truetype/symbol/README +++ b/extras/source/truetype/symbol/README @@ -9,7 +9,7 @@ important so that when two versions of the font are installed, e.g. one bundled inside the office installation, and one already installed on the system that the most recent font can be detected and favoured. -Bumping the font version is easiest done manually by bumping the the place in +Bumping the font version is easiest done manually by bumping the place in the .sfd where the version is mentioned, e.g. -Version: 102.3 @@ -21,5 +21,5 @@ The glyph names in the font should follow Adobe Glyph list for new fonts Fragments of OpenSymbol are mapped internally to a number of other fonts for interoperability purposes. See -unotools/source/misc/fontcvt.cxx pwrt. the StarSymbol conversion -tables. \ No newline at end of file +unotools/source/misc/fontcvt.cxx pwrt, the StarSymbol conversion +tables. commit d35b5c8db00afb0316b7ae4c43126a5dad194cbb Author: Khaled Hosny Date: Sat Nov 19 15:07:03 2016 +0200 tdf#103891: Fix DX array calculation This partially reverts: commit c49d5dea164b09b05a898495fa2dd48b7ca4f0e4 Author: Khaled Hosny Date: Fri Nov 11 18:24:11 2016 +0200 tdf#103765: Minimize the effect of rounding to int Instead of scaling the relative coordinates and accumulating rounding errors, scale the absolute coordinates. Also round to int instead of truncating. as it results in OutputDevice::GetTextArray() calculating wrong absolute DX array. Again the whole DX array thing is brain dead. Change-Id: Ia257b73062315b797b5ed52e434562fad3b3fb90 diff --git a/vcl/source/gdi/CommonSalLayout.cxx b/vcl/source/gdi/CommonSalLayout.cxx index 9ad1967..b9240e7 100644 --- a/vcl/source/gdi/CommonSalLayout.cxx +++ b/vcl/source/gdi/CommonSalLayout.cxx @@ -595,11 +595,13 @@ bool CommonSalLayout::LayoutText(ImplLayoutArgs& rArgs) nYOffset = -pHbPositions[i].y_offset; } -Point aNewPos(lround((aCurrPos.X() + nXOffset) * nXScale), - lround((aCurrPos.Y() + nYOffset) * nYScale)); +nAdvance *= nXScale; +nXOffset *= nXScale; +nYOffset *= nYScale; + +Point aNewPos(aCurrPos.X() + nXOffset, aCurrPos.Y() + nYOffset); const GlyphItem aGI(nCharPos, nGlyphIndex, aNewPos, nGlyphFlags, -lround(nAdvance * nXScale), -lround(nXOffset * nXScale)); +nAdvance, nXOffset); AppendGlyph(aGI); aCurrPos.X() += nAdvance; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - extras/source sc/source sw/inc sw/source sw/uiconfig sw/UIConfig_swriter.mk
extras/source/glade/libreoffice-catalog.xml.in |5 sc/source/ui/inc/content.hxx |1 sc/source/ui/navipi/content.cxx|5 sc/source/ui/navipi/navipi.cxx | 18 sw/UIConfig_swriter.mk |1 sw/inc/cmdid.h | 29 sw/inc/helpid.h| 29 sw/source/uibase/inc/conttree.hxx | 18 sw/source/uibase/inc/navipi.hxx| 33 - sw/source/uibase/inc/utlui.hrc |5 sw/source/uibase/utlui/content.cxx | 262 sw/source/uibase/utlui/glbltree.cxx| 81 +- sw/source/uibase/utlui/navipi.cxx | 801 ++--- sw/source/uibase/utlui/navipi.hrc |2 sw/source/uibase/utlui/navipi.src | 294 - sw/uiconfig/swriter/ui/navigatorpanel.ui | 487 +++ 16 files changed, 1074 insertions(+), 997 deletions(-) New commits: commit 045367d9ba43ec6afb003fd9117ae186c7e18e34 Author: Caolán McNamara Date: Tue Oct 11 15:30:15 2016 +0100 Master Document toggle missing if switch to master doc from normal doc regression since... commit 20e2d7e7d1c518fe514e8252836c1c728fe3fc27 Author: akki95 Date: Sat Jan 30 09:55:41 2016 +0530 tdf#95408 -"Toggle" in Writer Navigator to be more explicit in what it toggles Change-Id: I310eb7bfc39993ba54bbd9eca04ce721c8a68ea6 diff --git a/sw/source/uibase/utlui/navipi.cxx b/sw/source/uibase/utlui/navipi.cxx index a6f293b..5d5e021 100644 --- a/sw/source/uibase/utlui/navipi.cxx +++ b/sw/source/uibase/utlui/navipi.cxx @@ -840,7 +840,7 @@ void SwNavigationPI::StateChanged( sal_uInt16 nSID, SfxItemState /*eState*/, SwWrtShell* pWrtShell = pActView->GetWrtShellPtr(); m_aContentTree->SetActiveShell(pWrtShell); bool bGlobal = IsGlobalDoc(); - m_aContentToolBox->EnableItem(m_aContentToolBox->GetItemId("toggle"), bGlobal); + m_aContentToolBox->ShowItem(m_aContentToolBox->GetItemId("toggle"), bGlobal); if ((!bGlobal && IsGlobalMode()) || (!IsGlobalMode() && m_pConfig->IsGlobalActive())) { ToggleTree(); commit 33603a582bdd173a8e85c78bb0e8ef82874b8e59 Author: Caolán McNamara Date: Mon Oct 10 15:09:24 2016 +0100 convert writer navigator to .ui format Change-Id: I83f834ea050372362b50de61753c2b3e33c67778 diff --git a/extras/source/glade/libreoffice-catalog.xml.in b/extras/source/glade/libreoffice-catalog.xml.in index ecb5b94..3dc6c1b 100644 --- a/extras/source/glade/libreoffice-catalog.xml.in +++ b/extras/source/glade/libreoffice-catalog.xml.in @@ -745,6 +745,11 @@ + + + diff --git a/sc/source/ui/inc/content.hxx b/sc/source/ui/inc/content.hxx index 4c60d15..4a673c7 100644 --- a/sc/source/ui/inc/content.hxx +++ b/sc/source/ui/inc/content.hxx @@ -129,6 +129,7 @@ public: void SetNavigatorDlgFlag(bool isInNavigateDlg){ bisInNavigatoeDlg=isInNavigateDlg;}; virtual voidMouseButtonDown( const MouseEvent& rMEvt ) override; virtual voidKeyInput( const KeyEvent& rKEvt ) override; +virtual SizeGetOptimalSize() const override; voidInitWindowBits( bool bButtons ); diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx index b309d59..fd5bb59 100644 --- a/sc/source/ui/navipi/content.cxx +++ b/sc/source/ui/navipi/content.cxx @@ -134,6 +134,11 @@ ScContentTree::ScContentTree(vcl::Window* pParent, ScNavigatorDlg* pNavigatorDlg pTmpEntry= nullptr; } +Size ScContentTree::GetOptimalSize() const +{ +return LogicToPixel(Size(110, 100), MapUnit::MapAppFont); +} + ScContentTree::~ScContentTree() { disposeOnce(); diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx index 2443250..e3782a5 100644 --- a/sc/source/ui/navipi/navipi.cxx +++ b/sc/source/ui/navipi/navipi.cxx @@ -83,11 +83,7 @@ ColumnEdit::~ColumnEdit() disposeOnce(); } -VCL_BUILDER_DECL_FACTORY(ColumnEdit) -{ -(void)rMap; -rRet = VclPtr::Create(pParent, WB_BORDER | WB_SPIN | WB_REPEAT | WB_RIGHT); -} +VCL_BUILDER_FACTORY_ARGS(ColumnEdit, WB_BORDER | WB_SPIN | WB_REPEAT | WB_RIGHT) bool ColumnEdit::Notify( NotifyEvent& rNEvt ) { @@ -264,11 +260,7 @@ RowEdit::~RowEdit() disposeOnce(); } -VCL_BUILDER_DECL_FACTORY(RowEdit) -{ -(void)rMap; -rRet = VclPtr::Create(pParent, WB_BORDER | WB_SPIN | WB_REPEAT | WB_RIGHT); -} +VCL_BUILDER_FACTORY_ARGS(RowEdit, WB_BORDER | WB_SPIN | WB_REPEAT | WB_RIGHT) bool RowEdit::Notify( NotifyEvent& rNEvt ) { @@ -417,9 +409,9 @@ void ScNavigatorDlg::UpdateButtons() aTbxCmd->SetItemImage(nDragModeId, Image(ScResId(nImageId))); } -ScNavigatorSettings::ScNavigatorSettings() : -mnRootSelected( ScContentId::ROOT ), -mnChildSelected( SC_CONTENT_NOCHILD ) +ScNavigatorSettings::ScNavigat
[Libreoffice-commits] core.git: 2 commits - extras/source svx/source svx/uiconfig
extras/source/templates/presnt/AbstractGreen.otp |binary extras/source/templates/presnt/AbstractRed.otp|binary extras/source/templates/presnt/AbstractYellow.otp |binary svx/source/dialog/crashreportdlg.cxx | 15 +++ svx/source/dialog/crashreportdlg.hxx |1 + svx/uiconfig/ui/crashreportdlg.ui | 15 +++ 6 files changed, 31 insertions(+) New commits: commit 74b8ae360a5bdc9d6a37bc80136ac4bc7ede7563 Author: Francisco Adrián Sánchez Date: Mon Oct 10 22:02:47 2016 +0200 Fix language on Abstract* templates Changed the default language from German to English (US) Corrected also the area and line style of background objects Change-Id: I632b922c0e48ea578a5290015ddc499ba2af0781 diff --git a/extras/source/templates/presnt/AbstractGreen.otp b/extras/source/templates/presnt/AbstractGreen.otp index d819926..0ac2540 100644 Binary files a/extras/source/templates/presnt/AbstractGreen.otp and b/extras/source/templates/presnt/AbstractGreen.otp differ diff --git a/extras/source/templates/presnt/AbstractRed.otp b/extras/source/templates/presnt/AbstractRed.otp index 52525f7..a43f80b 100644 Binary files a/extras/source/templates/presnt/AbstractRed.otp and b/extras/source/templates/presnt/AbstractRed.otp differ diff --git a/extras/source/templates/presnt/AbstractYellow.otp b/extras/source/templates/presnt/AbstractYellow.otp index 0b0894a..59829b4 100644 Binary files a/extras/source/templates/presnt/AbstractYellow.otp and b/extras/source/templates/presnt/AbstractYellow.otp differ commit 5daafc88ca0d8fd06080a6fe2f7487188953ebe3 Author: Samuel Mehrbrodt Date: Mon Oct 10 21:55:10 2016 +0200 Allow entering safemode after crash Change-Id: Id12d3c10714b7ce5722c2270e9e897db63bedcf2 diff --git a/svx/source/dialog/crashreportdlg.cxx b/svx/source/dialog/crashreportdlg.cxx index d31a863..bbac211 100644 --- a/svx/source/dialog/crashreportdlg.cxx +++ b/svx/source/dialog/crashreportdlg.cxx @@ -15,8 +15,12 @@ #include #include #include +#include #include +#include +#include + CrashReportDialog::CrashReportDialog(vcl::Window* pParent): Dialog(pParent, "CrashReportDialog", "svx/ui/crashreportdlg.ui") @@ -27,6 +31,7 @@ CrashReportDialog::CrashReportDialog(vcl::Window* pParent): get(mpEditPreUpload, "ed_pre"); get(mpEditPostUpload, "ed_post"); get(mpFtBugReport, "ed_bugreport"); +get(mpCBSafeMode, "check_safemode"); maSuccessMsg = mpEditPostUpload->GetText(); @@ -49,6 +54,7 @@ void CrashReportDialog::dispose() mpEditPreUpload.clear(); mpEditPostUpload.clear(); mpFtBugReport.clear(); +mpCBSafeMode.clear(); Dialog::dispose(); } @@ -94,6 +100,15 @@ IMPL_LINK(CrashReportDialog, BtnHdl, Button*, pBtn, void) { Close(); } + +// Check whether to go to safe mode +if (mpCBSafeMode->IsChecked()) +{ +//TODO: Actually set the safe mode, currently it's only restarting +css::uno::Reference< css::uno::XComponentContext > xContext = comphelper::getProcessComponentContext(); +css::task::OfficeRestartManager::get(xContext)->requestRestart( +css::uno::Reference< css::task::XInteractionHandler >()); +} } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/crashreportdlg.hxx b/svx/source/dialog/crashreportdlg.hxx index 602d706..ecdd445 100644 --- a/svx/source/dialog/crashreportdlg.hxx +++ b/svx/source/dialog/crashreportdlg.hxx @@ -34,6 +34,7 @@ private: VclPtr mpEditPreUpload; VclPtr mpEditPostUpload; VclPtr mpFtBugReport; +VclPtr mpCBSafeMode; OUString maSuccessMsg; diff --git a/svx/uiconfig/ui/crashreportdlg.ui b/svx/uiconfig/ui/crashreportdlg.ui index 9dd35f6..4b8b229 100644 --- a/svx/uiconfig/ui/crashreportdlg.ui +++ b/svx/uiconfig/ui/crashreportdlg.ui @@ -111,6 +111,21 @@ Thank you for your help in improving %PRODUCTNAME. 3 + + + Restart LibreOffice to enter Safe Mode + True + True + False + 0 + True + + + False + True + 3 + + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - extras/source
extras/source/autocorr/lang/lt/DocumentList.xml| 143 extras/source/autocorr/lang/pt-PT/DocumentList.xml | 3150 - extras/source/autocorr/lang/zh-TW/DocumentList.xml | 109 3 files changed, 3390 insertions(+), 12 deletions(-) New commits: commit 28f9dec5be1420a6523a7a4f8396c43933b9c5c1 Author: Christian Lohmaier Date: Wed Aug 24 22:23:48 2016 +0200 update emoji autocorrect files from po-files Change-Id: Iae15a220df278da393fd992faaa34c7f8e6f78fb diff --git a/extras/source/autocorr/lang/lt/DocumentList.xml b/extras/source/autocorr/lang/lt/DocumentList.xml index b9d97d8..2d6bae1 100644 --- a/extras/source/autocorr/lang/lt/DocumentList.xml +++ b/extras/source/autocorr/lang/lt/DocumentList.xml @@ -83,6 +83,7 @@ + @@ -143,9 +144,13 @@ + + + + @@ -155,30 +160,47 @@ + + + + + + + + + + + + + + + + + @@ -195,6 +217,8 @@ + + @@ -242,6 +266,7 @@ + @@ -269,6 +294,7 @@ + @@ -284,11 +310,13 @@ + + @@ -300,11 +328,19 @@ + + + + + + + + @@ -320,6 +356,7 @@ + @@ -334,11 +371,15 @@ + + + + @@ -350,13 +391,19 @@ + + + + + + @@ -368,6 +415,7 @@ + @@ -379,7 +427,9 @@ + + @@ -399,6 +449,7 @@ + @@ -410,6 +461,8 @@ + + @@ -430,6 +483,7 @@ + @@ -445,8 +499,10 @@ + + @@ -459,15 +515,21 @@ + + + + + + @@ -481,17 +543,23 @@ + + + + + + @@ -519,6 +587,7 @@ + @@ -530,6 +599,9 @@ + + + @@ -541,9 +613,11 @@ + + @@ -553,15 +627,23 @@ + + + + + + + + @@ -571,6 +653,7 @@ + @@ -583,6 +666,7 @@ + @@ -593,26 +677,38 @@ + + + + + + + + + + + + @@ -625,6 +721,7 @@ + @@ -633,6 +730,7 @@ + @@ -643,6 +741,8 @@ + + @@ -650,14 +750,19 @@ + + + + + @@ -666,8 +771,12 @@ + + + + @@ -686,6 +795,7 @@ + @@ -695,6 +805,7 @@ + @@ -731,6 +842,8 @@ + + @@ -747,8 +860,13 @@ + + + + + @@ -762,9 +880,12 @@ + + + @@ -774,6 +895,9 @@ + + + @@ -783,6 +907,9 @@ + + + @@ -793,6 +920,11 @@ + + + + + @@ -805,16 +937,23 @@ + + + + + + + @@ -828,6 +967,8 @@ + + @@ -835,6 +976,7 @@ + @@ -847,6 +989,7 @@ + diff --git a/extras/source/autocorr/lang/pt-PT/DocumentList.xml b/extras/source/autocorr/lang/pt-PT/DocumentList.xml index 6402563..94e3698 100644 --- a/extras/source/autocorr/lang/pt-PT/DocumentList.xml +++ b/extras/source/autocorr/lang/pt-PT/DocumentList.xml @@ -3,1184 +3,10 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
[Libreoffice-commits] core.git: 2 commits - extras/source readlicense_oo/license
extras/source/autocorr/lang/hu/DocumentList.xml |2 extras/source/autocorr/lang/lt/DocumentList.xml | 215 ++ readlicense_oo/license/CREDITS.fodt | 2193 3 files changed, 1326 insertions(+), 1084 deletions(-) New commits: commit bd894e5a7b9a9d6a3d3e4ea668bfea050ef39bae Author: Christian Lohmaier Date: Tue Jul 19 19:08:35 2016 +0200 update credits Change-Id: Ie49cfb83d86e85b593958fc4048022f71c351267 diff --git a/readlicense_oo/license/CREDITS.fodt b/readlicense_oo/license/CREDITS.fodt index e56ffeb..494e917 100644 --- a/readlicense_oo/license/CREDITS.fodt +++ b/readlicense_oo/license/CREDITS.fodt @@ -1,10 +1,10 @@ http://www.w3.org/1999/xlink"; xmlns:dc="http://purl.org/dc/elements/1.1/"; xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML"; xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:config="urn:oas is:names:tc:opendocument:xmlns:config:1.0" xmlns:ooo="http://openoffice.org/2004/office"; xmlns:ooow="http://openoffice.org/2004/writer"; xmlns:oooc="http://openoffice.org/2004/calc"; xmlns:dom="http://www.w3.org/2001/xml-events"; xmlns:xforms="http://www.w3.org/2002/xforms"; xmlns:xsd="http://www.w3.org/2001/XMLSchema"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:rpt="http://openoffice.org/2005/report"; xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xhtml="http://www.w3.org/1999/xhtml"; xmlns:grddl="http://www.w3.org/2003/g/data-view#"; xmlns:officeooo="http://openoffice.org/2009/office"; xmlns:tableooo="http://openoffice.org/2009/table"; xmlns:drawooo="http://openoffice.org/2010/draw"; xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:formx="urn:openoffice:names: experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" office:mimetype="application/vnd.oasis.opendocument.text"> - Credits » LibreOfficeCreditscontributorscodersdevelopersCredits for the LibreOffice development/coding.LibreOffice/5.1.4.2$Linux_X86_64 LibreOffice_project/f99d75f39f1c57ebdd7ffc5f42867c12031db97a2012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA + Credits » LibreOfficeCreditscontributorscodersdevelopersCredits for the LibreOffice development/coding.LibreOffice/5.1.4.2$Linux_X86_64 LibreOffice_project/f99d75f39f1c57ebdd7ffc5f42867c12031db97a2012-02-20T22:17:18.06000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA - 686 + 660 501 41197 21645 @@ -16,9 +16,9 @@ 3676 3471 501 - 686 + 660 41697 - 22329 + 22303 0 0 false @@ -68,7 +68,7 @@ false false true - 5578286 + 5593571 false false false @@ -312,23 +312,26 @@ - + - + - + - + + + + @@ -390,19 +393,19 @@ - + - + - + - + - + @@ -1027,7 +1030,7 @@ Credits -1177 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2016-07-12 09:40:24. +1178 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2016-06-30 12:29:58. * marks developers whose first contributions happened after 2010-09-28. Developers committing code since 2010-09-28 @@ -1054,10 +1057,10 @@ Vladimir GlazunovCommits: 25434Joined: 2000-12-04 - Caolán McNamaraCommits: 19657Joined: 2000-10-10 + Caolán McNamaraCommits: 19682Joined: 2000-10-10 - Stephan BergmannCommits: 12423Joined: 2000-10-04 + Stephan BergmannCommits: 12455Joined: 2000-10-04 Ivo HinkelmannCommits: 9480Joined: 2002-09-09 @@ -1068,32 +1071,32 @@ Tor LillqvistCommits: 7439Joined: 2010-03-23 - *Noel GrandinCommits: 6109Joined: 2011-12-12 + *Noel GrandinCommits: 6121Joined: 2011-12-12 - Miklos VajnaCommits: 5726Joined: 2010-07-29 + Miklos VajnaCommits: 5745Joined: 2010-07-29 - Michael StahlCommits: 5520Joined: 2008-06-16 + Michael StahlCommits: 5525Joined: 200
[Libreoffice-commits] core.git: 2 commits - extras/source l10ntools/source
extras/source/wordbook/technical.dic | 25 + l10ntools/source/lngmerge.cxx|3 ++- 2 files changed, 27 insertions(+), 1 deletion(-) New commits: commit 851b3afb28a87934b933184af2ebb8f8144815ab Author: László Németh Date: Fri May 22 15:37:25 2015 +0200 l10ntools: support x-comments in ulf format Change-Id: I9e2812b02348538aa5bb6a130530d12b31a374dd diff --git a/l10ntools/source/lngmerge.cxx b/l10ntools/source/lngmerge.cxx index 5465d55..959a93c 100644 --- a/l10ntools/source/lngmerge.cxx +++ b/l10ntools/source/lngmerge.cxx @@ -114,6 +114,7 @@ bool LngParser::CreatePO( const OString &rPOFile ) else { WritePO( aPOStream , Text , sSource , sID ); } +Text.erase("x-comment"); } aPOStream.close(); return true; @@ -129,7 +130,7 @@ void LngParser::WritePO(PoOfstream &aPOStream, { common::writePoEntry( "Ulfex", aPOStream, rActFileName, "LngText", -rID, OString(), OString(), rText_inout["en-US"]); +rID, OString(), rText_inout.count("x-comment") ? rText_inout["x-comment"] : OString(), rText_inout["en-US"]); } } commit c4318b8c1912c1ee947d96b02b3d4abf2eaf65f6 Author: László Németh Date: Fri May 22 12:38:59 2015 +0200 add Greek small letters to the technical spelling dictionary Greek upper case letters have already been ignored during spell checking, so there is no reason to avoid the small ones, especially because they are frequently used in scientific and technical writings. Change-Id: I128fe8c51b7e9802c18fc282674998741c8e4fb2 diff --git a/extras/source/wordbook/technical.dic b/extras/source/wordbook/technical.dic index e255bc4..3ee3281 100644 --- a/extras/source/wordbook/technical.dic +++ b/extras/source/wordbook/technical.dic @@ -235,3 +235,28 @@ Xubuntu Yahoo YouTube ZENworks +α +β +γ +δ +ε +ζ +η +θ +ι +κ +λ +μ +ν +ξ +ο +Ï +Ï +Ï +Ï +Ï +Ï +Ï +Ï +Ï +Ï ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - extras/source
extras/source/autocorr/lang/en-US/DocumentList.xml | 990 + extras/source/autocorr/lang/hu/DocumentList.xml| 990 + 2 files changed, 1980 insertions(+) New commits: commit 2b5d533651333a27dd46e494fcd1a016483bb0b1 Author: László Németh Date: Wed May 20 12:41:42 2015 +0200 AutoCorrect: Emoji support (hu) Change-Id: Ic2ad51b0ce496d28ba94b31302c7abb21a1c59a7 diff --git a/extras/source/autocorr/lang/hu/DocumentList.xml b/extras/source/autocorr/lang/hu/DocumentList.xml index 775c714..2c4d2d7 100644 --- a/extras/source/autocorr/lang/hu/DocumentList.xml +++ b/extras/source/autocorr/lang/hu/DocumentList.xml @@ -672,4 +672,994 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + commit d3c12e22aafd30387a20b437d956cafead314ec1 Author: László Németh Date: Wed May 20 12:14:42 2015 +0200 AutoCorrect: Emoji support (en-US) Modern graphical operating systems have default Unicode 6 support with several Emojis and other useful special characters. Using their short names within col
[Libreoffice-commits] core.git: 2 commits - extras/source include/svx include/vcl svx/source svx/uiconfig svx/UIConfig_svx.mk vcl/source
extras/source/glade/libreoffice-catalog.xml.in |3 include/svx/dialogs.hrc|3 include/svx/dlgctl3d.hxx | 15 include/svx/float3d.hxx| 204 +- include/vcl/dockwin.hxx|6 svx/UIConfig_svx.mk|1 svx/source/dialog/dlgctl3d.cxx | 36 svx/source/engine3d/float3d.cxx| 2059 ++--- svx/source/engine3d/float3d.src| 1119 - svx/uiconfig/ui/docking3deffects.ui| 2048 vcl/source/window/dockwin.cxx | 32 11 files changed, 3053 insertions(+), 2473 deletions(-) New commits: commit a73475cecdac393b40c34770be65be40bf05e011 Author: Caolán McNamara Date: Tue Dec 30 15:54:34 2014 + DockingWindow will need a timer after all to update layout after initial show when contents change Change-Id: I8edbe84fa366cdb04dbfe5e479dc01cbf04dbf4c diff --git a/include/vcl/dockwin.hxx b/include/vcl/dockwin.hxx index 6dfad81..6914781 100644 --- a/include/vcl/dockwin.hxx +++ b/include/vcl/dockwin.hxx @@ -247,6 +247,7 @@ private: sal_Int32 mnDockRight; sal_Int32 mnDockBottom; WinBits mnFloatBits; +IdlemaLayoutIdle; boolmbDockCanceled:1, mbDockPrevented:1, mbFloatPrevented:1, @@ -268,6 +269,7 @@ private: SAL_DLLPRIVATE voidImplInitDockingWindowData(); SAL_DLLPRIVATE void setPosSizeOnContainee(Size aSize, Window &rBox); +DECL_DLLPRIVATE_LINK( ImplHandleLayoutTimerHdl, void* ); // Copy assignment is forbidden and not implemented. SAL_DLLPRIVATE DockingWindow (const DockingWindow &); @@ -291,6 +293,7 @@ public: SAL_DLLPRIVATE boolImplStartDocking( const Point& rPos ); SAL_DLLPRIVATE boolisDeferredInit() const { return mbIsDefferedInit; } +SAL_DLLPRIVATE boolhasPendingLayout() const { return maLayoutIdle.IsActive(); } void doDeferredInit(WinBits nBits); protected: DockingWindow( WindowType nType ); @@ -361,9 +364,10 @@ public: voidSetOutputSizePixel( const Size& rNewSize ) SAL_OVERRIDE; SizeGetOutputSizePixel() const; -virtual void SetText( const OUString& rStr ) SAL_OVERRIDE; +virtual void SetText( const OUString& rStr ) SAL_OVERRIDE; virtual OUString GetText() const SAL_OVERRIDE; virtual Size GetOptimalSize() const SAL_OVERRIDE; +virtual void queue_resize(StateChangedType eReason = StateChangedType::LAYOUT) SAL_OVERRIDE; }; inline void DockingWindow::SetPin( bool bPin ) diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx index 95dd54b..6d9186e 100644 --- a/vcl/source/window/dockwin.cxx +++ b/vcl/source/window/dockwin.cxx @@ -329,6 +329,10 @@ void DockingWindow::ImplInitDockingWindowData() mbIsCalculatingInitialLayoutSize = false; mbInitialLayoutDone = false; mpDialogParent = NULL; + +//To-Do, reuse maResizeTimer +maLayoutIdle.SetPriority(VCL_IDLE_PRIORITY_RESIZE); +maLayoutIdle.SetIdleHdl( LINK( this, DockingWindow, ImplHandleLayoutTimerHdl ) ); } void DockingWindow::ImplInit( vcl::Window* pParent, WinBits nStyle ) @@ -1078,6 +1082,8 @@ bool DockingWindow::isLayoutEnabled() const void DockingWindow::setOptimalLayoutSize() { +maLayoutIdle.Stop(); + //resize DockingWindow to fit requisition on initial show Window *pBox = GetWindow(WINDOW_FIRSTCHILD); @@ -1121,4 +1127,30 @@ Size DockingWindow::GetOptimalSize() const return Window::CalcWindowSize(aSize); } +void DockingWindow::queue_resize(StateChangedType /*eReason*/) +{ +if (hasPendingLayout() || isCalculatingInitialLayoutSize()) +return; +if (!isLayoutEnabled()) +return; +WindowImpl *pWindowImpl = mpWindowImpl->mpBorderWindow ? mpWindowImpl->mpBorderWindow->mpWindowImpl : mpWindowImpl; +pWindowImpl->mnOptimalWidthCache = -1; +pWindowImpl->mnOptimalHeightCache = -1; +maLayoutIdle.Start(); +} + +IMPL_LINK(DockingWindow, ImplHandleLayoutTimerHdl, void*, EMPTYARG) +{ +if (!isLayoutEnabled()) +{ +SAL_WARN("vcl.layout", "DockingWindow has become non-layout because extra children have been added directly to it."); +return 0; +} + +Window *pBox = GetWindow(WINDOW_FIRSTCHILD); +assert(pBox); +setPosSizeOnContainee(GetSizePixel(), *pBox); +return 0; +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ commit 11d0c28601dc89c48e67a7b39ba82dd52e660334 Author: Caolán McNamara Date: Sun Dec 28 16:30:18 2014 + convert RID_SVXFLOAT_3D docking window to .ui This is an epic dialog with lots of moving parts Change-Id: I4e53580ac5b01f4a717d2fe594a18c8e83b45a6f diff --git a/extras/source/glade/libreoffice-cata
[Libreoffice-commits] core.git: 2 commits - extras/source svx/uiconfig
extras/source/glade/libreoffice-catalog.xml.in |7 ++- svx/uiconfig/ui/colorwindow.ui |4 ++-- 2 files changed, 4 insertions(+), 7 deletions(-) New commits: commit 9c818268767d6a1c1bc731ae30c45883bab987e7 Author: Maxim Monastirsky Date: Thu Sep 18 09:50:00 2014 +0300 Use svxcorelo-SvxColorValueSet instead Change-Id: Ib2ad71326d0ff45eae01a16d675c3d40e1ba1f2c diff --git a/svx/uiconfig/ui/colorwindow.ui b/svx/uiconfig/ui/colorwindow.ui index d15eb42..8daa9b2 100644 --- a/svx/uiconfig/ui/colorwindow.ui +++ b/svx/uiconfig/ui/colorwindow.ui @@ -55,7 +55,7 @@ - + 200 150 True @@ -93,7 +93,7 @@ - + True True True commit dca88d025f28cb1b438bc34c32d048d940025063 Author: Maxim Monastirsky Date: Thu Sep 18 09:51:55 2014 +0300 Revert "Add svxlo-SvxColorValueSet to the glade catalog" This reverts commit 9df22b4ac0f97346701d0284abc74499310e660f. diff --git a/extras/source/glade/libreoffice-catalog.xml.in b/extras/source/glade/libreoffice-catalog.xml.in index 31dd5ee..12ff8b4 100644 --- a/extras/source/glade/libreoffice-catalog.xml.in +++ b/extras/source/glade/libreoffice-catalog.xml.in @@ -364,10 +364,7 @@ - - - + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - extras/source
extras/source/wordbook/technical.dic | 26 -- 1 file changed, 8 insertions(+), 18 deletions(-) New commits: commit 6f126ed6a7f375c26bfc44cb9256c0a03ad99b7b Author: Bjoern Michaelsen Date: Wed May 21 12:39:32 2014 +0200 remove obsolete Ubuntu names (pre 10.04 LTS) Change-Id: I427e4318eab9ed50db882176e5542b5cb63d298b diff --git a/extras/source/wordbook/technical.dic b/extras/source/wordbook/technical.dic index 9416d90..2349c9e 100644 --- a/extras/source/wordbook/technical.dic +++ b/extras/source/wordbook/technical.dic @@ -22,14 +22,12 @@ AppXRay= Argus= Asus AutoVue= -Badger Base= Base24= BeOS= Bing Bitcoin BorderManager -Breezy BSD= CADView= Calc= @@ -48,7 +46,6 @@ ConsoleOne ConText= COREid= Corporation -Dapper dBase Debian debootstrap @@ -59,12 +56,9 @@ Docuflex= Documaker= Document dpkg -Drake Draw= -Edgy eDirectory Edubuntu -Eft eGuide Electronics Etch @@ -72,9 +66,7 @@ Ethernet Evolution Exadata= Facebook -Fawn Fedora= -Feisty Firebird Firefox FLAC @@ -85,7 +77,6 @@ FreeBSD Fujitsu gcc gcj -Gibbon GIF gij GNOME @@ -93,18 +84,14 @@ GNU Google GPS GroupWise -Gutsy Hardy -Hedgehog Heron Hewlett-Packard Hi-Fi Hitachi -Hoary HP HP/UX= HTML -Ibex IBM iChain Identi.ca @@ -112,17 +99,12 @@ iFolder iManager Impress= Intel -Intrepid iOS iPrint -Jackalope -Jaunty JavaScript JPEG -Karmic KDE Kerberos -Koala Kubuntu Launchpad LDAP commit c37fdd65021ab1f64aa05f83fd62fcf97088cc95 Author: Bjoern Michaelsen Date: Wed May 21 12:34:20 2014 +0200 add current Ubuntu release names Change-Id: Ia84e758ca598d506c9bdae524afff0421f68be81 diff --git a/extras/source/wordbook/technical.dic b/extras/source/wordbook/technical.dic index 3f88b46..9416d90 100644 --- a/extras/source/wordbook/technical.dic +++ b/extras/source/wordbook/technical.dic @@ -171,6 +171,7 @@ Opera Optronics Oracle= Panasonic +Pangolin PayPal PeopleSoft= Plug-in @@ -178,16 +179,19 @@ PNG PolyServe POP3 PostgreSQL +Precise PPPoE Quanta RHEL= Rosetta RosettaNet= rpm +Salamander Samba Samsung SAP Sarge +Saucy Satmetrix= SecretStore SecureLogin @@ -211,14 +215,18 @@ SunHSI= SunOS= SunSAI= SUSE +Tahr TeliaSonera The Thunderbird Toshiba TrueType +Trusty Twitter Ubuntu uname +Unicorn +Utopic URL Visa VoIP= ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - extras/source sc/inc sc/source sc/uiconfig sc/UIConfig_scalc.mk sw/source
extras/source/glade/libreoffice-catalog.xml.in |4 sc/UIConfig_scalc.mk |1 sc/inc/helpids.h |1 sc/inc/sc.hrc |1 sc/inc/scabstdlg.hxx |2 sc/source/ui/attrdlg/scdlgfact.cxx | 16 - sc/source/ui/attrdlg/scdlgfact.hxx |2 sc/source/ui/dbgui/pvfundlg.cxx| 153 +- sc/source/ui/dbgui/pvfundlg.src| 137 - sc/source/ui/dbgui/pvlaydlg.cxx|2 sc/source/ui/inc/pvfundlg.hxx | 35 +- sc/uiconfig/scalc/ui/datafielddialog.ui| 352 + sw/source/core/doc/docbm.cxx | 76 +++-- sw/source/core/inc/MarkManager.hxx |1 14 files changed, 511 insertions(+), 272 deletions(-) New commits: commit b33c7476e6975ecd7cfb233a7a0e8b417870bea5 Author: Caolán McNamara Date: Fri Jan 17 09:40:03 2014 + convert data field dialog to .ui Change-Id: I68da93c1227e8140511f3ad4071c87b3cf0443c0 diff --git a/extras/source/glade/libreoffice-catalog.xml.in b/extras/source/glade/libreoffice-catalog.xml.in index 6d7a6dc..56572f2 100644 --- a/extras/source/glade/libreoffice-catalog.xml.in +++ b/extras/source/glade/libreoffice-catalog.xml.in @@ -578,6 +578,10 @@ generic-name="CondFormatList" parent="GtkDrawingArea" icon-name="widget-gtk-drawingarea"/> + + diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk index 9fb69cf..729ae69 100644 --- a/sc/UIConfig_scalc.mk +++ b/sc/UIConfig_scalc.mk @@ -73,6 +73,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\ sc/uiconfig/scalc/ui/covariancedialog \ sc/uiconfig/scalc/ui/createnamesdialog \ sc/uiconfig/scalc/ui/databaroptions \ + sc/uiconfig/scalc/ui/datafielddialog \ sc/uiconfig/scalc/ui/dataform \ sc/uiconfig/scalc/ui/datastreams \ sc/uiconfig/scalc/ui/definedatabaserangedialog \ diff --git a/sc/inc/helpids.h b/sc/inc/helpids.h index 67c6156..2e0cf5e 100644 --- a/sc/inc/helpids.h +++ b/sc/inc/helpids.h @@ -152,7 +152,6 @@ #define HID_SC_DRAW_RENAME "SC_HID_SC_DRAW_RENAME" -#define HID_SC_DPDATAFIELD "SC_HID_SC_DPDATAFIELD" #define HID_SC_DPSUBT_OPT "SC_HID_SC_DPSUBT_OPT" #define HID_SC_DPSUBT_HIDE "SC_HID_SC_DPSUBT_HIDE" #define HID_SC_DPNUMGROUP "SC_HID_SC_DPNUMGROUP" diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc index e6a61f4..97630f8 100644 --- a/sc/inc/sc.hrc +++ b/sc/inc/sc.hrc @@ -1080,7 +1080,6 @@ #define RID_SCDLG_DAPIDATA (SC_DIALOGS_START + 131) -#define RID_SCDLG_DPDATAFIELD (SC_DIALOGS_START + 133) #define RID_SCDLG_DPSUBTOTAL_OPT(SC_DIALOGS_START + 134) #define RID_SCDLG_DPNUMGROUP(SC_DIALOGS_START + 135) #define RID_SCDLG_DPDATEGROUP (SC_DIALOGS_START + 136) diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx index 52d52bc..9b63ee0 100644 --- a/sc/inc/scabstdlg.hxx +++ b/sc/inc/scabstdlg.hxx @@ -416,7 +416,7 @@ public: virtual AbstractScPivotFilterDlg * CreateScPivotFilterDlg ( Window* pParent, const SfxItemSet& rArgSet, sal_uInt16 nSourceTab , int nId ) = 0; -virtual AbstractScDPFunctionDlg * CreateScDPFunctionDlg( Window* pParent, int nId, +virtual AbstractScDPFunctionDlg * CreateScDPFunctionDlg( Window* pParent, const ScDPLabelDataVector& rLabelVec, const ScDPLabelData& rLabelData, const ScPivotFuncData& rFuncData ) = 0; diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx b/sc/source/ui/attrdlg/scdlgfact.cxx index cf1208e..01a2c54 100644 --- a/sc/source/ui/attrdlg/scdlgfact.cxx +++ b/sc/source/ui/attrdlg/scdlgfact.cxx @@ -881,24 +881,12 @@ AbstractScPivotFilterDlg * ScAbstractDialogFactory_Impl::CreateScPivotFilterDlg } AbstractScDPFunctionDlg * ScAbstractDialogFactory_Impl::CreateScDPFunctionDlg ( Window* pParent, -int nId, const ScDPLabelDataVector& rLabelVec, const ScDPLabelData& rLabelData, const ScPivotFuncData& rFuncData ) { -ScDPFunctionDlg * pDlg=NULL; -switch ( nId ) -{ -case RID_SCDLG_DPDATAFIELD : -pDlg = new ScDPFunctionDlg( pParent, rLabelVec, rLabelData, rFuncData ); -
[Libreoffice-commits] core.git: 2 commits - extras/source oox/source sc/inc sc/source sc/uiconfig sc/UIConfig_scalc.mk
extras/source/glade/libreoffice-catalog.xml.in |4 oox/source/ppt/timenodelistcontext.cxx | 17 +- sc/UIConfig_scalc.mk|1 sc/inc/sc.hrc |1 sc/source/ui/condformat/condformatdlg.cxx | 109 sc/source/ui/condformat/condformatdlgentry.cxx | 11 + sc/source/ui/inc/anyrefdg.hxx |6 sc/source/ui/inc/condformatdlg.hxx | 26 +-- sc/source/ui/miscdlgs/anyrefdg.cxx | 16 + sc/source/ui/src/condformatdlg.src | 64 --- sc/uiconfig/scalc/ui/conditionalformatdialog.ui | 202 11 files changed, 330 insertions(+), 127 deletions(-) New commits: commit 5b8a16209f1e1d8fc43157463384f6ab407ac514 Author: Steve Yin Date: Thu Jan 16 08:29:37 2014 + Resolves: #i119578# Lighten special effect in .PPTX won't display (cherry picked from commit 641aa4b583e27369b404584d094e0758a93ce5b5) Change-Id: I27a0503036087febc7f838dab4c2201eb0593d5c diff --git a/oox/source/ppt/timenodelistcontext.cxx b/oox/source/ppt/timenodelistcontext.cxx index 14bd0e2..7a9c3c7 100644 --- a/oox/source/ppt/timenodelistcontext.cxx +++ b/oox/source/ppt/timenodelistcontext.cxx @@ -70,27 +70,32 @@ namespace oox { namespace ppt { { } -sal_Int32 get() +Any get() { sal_Int32 nColor; +Sequence< double > aHSL( 3 ); +Any aColor; switch( colorSpace ) { case AnimationColorSpace::HSL: -nColor = ( ( ( one * 128 ) / 360 ) & 0xff ) << 16 -| ( ( ( two * 128 ) / 1000 ) & 0xff ) << 8 -| ( ( ( three * 128 ) / 1000 ) & 0xff ); +aHSL[ 0 ] = double(one) / 10; +aHSL[ 1 ] = double(two) / 10; +aHSL[ 2 ] = double(three) / 10; +aColor = Any(aHSL); break; case AnimationColorSpace::RGB: nColor = ( ( ( one * 128 ) / 1000 ) & 0xff ) << 16 | ( ( ( two * 128 ) / 1000 ) & 0xff ) << 8 | ( ( ( three * 128 ) / 1000 ) & 0xff ); +aColor = Any(nColor); break; default: nColor = 0; +aColor = Any( nColor ); break; } -return nColor; +return aColor; } sal_Int16 colorSpace; @@ -444,7 +449,7 @@ namespace oox { namespace ppt { if( maFromClr.isUsed() ) mpNode->setFrom( Any( maFromClr.getColor( rGraphicHelper ) ) ); if( mbHasByColor ) -mpNode->setBy( Any ( m_byColor.get() ) ); +mpNode->setBy( m_byColor.get() ); } } commit 34a94e6855782667f54110b0ff68bf3bf8f058a2 Author: Caolán McNamara Date: Mon Jan 13 14:48:45 2014 + Resolves: rhbz#1047871 convert conditional formattting dialog to widget layout the wrapper dialog not the list contained within Change-Id: I4f479385ec5d991f1ab4218cc371726558e6 diff --git a/extras/source/glade/libreoffice-catalog.xml.in b/extras/source/glade/libreoffice-catalog.xml.in index b43be2f..6d7a6dc 100644 --- a/extras/source/glade/libreoffice-catalog.xml.in +++ b/extras/source/glade/libreoffice-catalog.xml.in @@ -574,6 +574,10 @@ generic-name="CropExample" parent="GtkDrawingArea" icon-name="widget-gtk-drawingarea"/> + + diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk index b0308be..9fb69cf 100644 --- a/sc/UIConfig_scalc.mk +++ b/sc/UIConfig_scalc.mk @@ -67,6 +67,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\ sc/uiconfig/scalc/ui/chardialog \ sc/uiconfig/scalc/ui/colorrowdialog \ sc/uiconfig/scalc/ui/colwidthdialog \ + sc/uiconfig/scalc/ui/conditionalformatdialog \ sc/uiconfig/scalc/ui/consolidatedialog \ sc/uiconfig/scalc/ui/correlationdialog \ sc/uiconfig/scalc/ui/covariancedialog \ diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc index 6b8cc619..e6a61f4 100644 --- a/sc/inc/sc.hrc +++ b/sc/inc/sc.hrc @@ -1057,7 +1057,6 @@ #define RID_DROPMODE_URL(SC_DIALOGS_START + 93) #define RID_DROPMODE_LINK (SC_DIALOGS_START + 94) #define RID_DROPMODE_COPY (SC_DIALOGS_START + 95) -#define RID_SCDLG_CONDFORMAT(SC_DIALOGS_START + 96) // derivations from RID_SCDLG_SELENTRY diff --git a/sc/source/ui/condformat/condformatdlg.cxx b/sc/source/ui/condformat/condformatdlg.cxx index 80c51b7..f9b6f5a 100644 --- a/sc/source/ui/condformat/condformatdlg.cxx +++ b/sc/source/ui/condformat/c
[Libreoffice-commits] core.git: 2 commits - extras/source sw/inc sw/source sw/uiconfig sw/UIConfig_swriter.mk
extras/source/glade/libreoffice-catalog.xml.in |4 sw/UIConfig_swriter.mk |1 sw/inc/globals.hrc |2 sw/inc/helpid.h|1 sw/inc/swabstdlg.hxx |6 sw/source/ui/dialog/swdlgfact.cxx | 21 --- sw/source/ui/dialog/swdlgfact.hxx |6 sw/source/ui/inc/swrenamexnameddlg.hxx | 16 +- sw/source/ui/utlui/content.cxx |2 sw/source/ui/utlui/swrenamexnameddlg.cxx | 36 ++--- sw/source/ui/utlui/unotools.src| 51 sw/uiconfig/swriter/ui/editsectiondialog.ui|2 sw/uiconfig/swriter/ui/renameobjectdialog.ui | 153 + 13 files changed, 196 insertions(+), 105 deletions(-) New commits: commit a4660b78efba2de2e0d4ce85f955a751038e416e Author: Caolán McNamara Date: Fri Apr 26 14:07:48 2013 +0100 convert rename object dialog to .ui format Change-Id: I76b5c2d190b268de93973083f1f6ca41804008cf diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk index 1e58060..775a88c 100644 --- a/sw/UIConfig_swriter.mk +++ b/sw/UIConfig_swriter.mk @@ -96,6 +96,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\ sw/uiconfig/swriter/ui/previewzoomdialog \ sw/uiconfig/swriter/ui/printoptionspage \ sw/uiconfig/swriter/ui/printeroptions \ + sw/uiconfig/swriter/ui/renameobjectdialog \ sw/uiconfig/swriter/ui/rowheight \ sw/uiconfig/swriter/ui/sortdialog \ sw/uiconfig/swriter/ui/splittable \ diff --git a/sw/inc/globals.hrc b/sw/inc/globals.hrc index f12de51..22b5f54 100644 --- a/sw/inc/globals.hrc +++ b/sw/inc/globals.hrc @@ -190,7 +190,7 @@ #define TP_INSERT_SECTION (RC_GLOBALS_BEGIN + 85) #define DLG_INSERT_SECTION (RC_GLOBALS_BEGIN + 86) #define DLG_SECTION_PROPERTIES (RC_GLOBALS_BEGIN + 87) -#define DLG_RENAME_XNAMED (RC_GLOBALS_BEGIN + 88) + #define DLG_MULTI_TOX (RC_GLOBALS_BEGIN + 89) #define TP_TOX_SELECT (RC_GLOBALS_BEGIN + 90) #define TP_TOX_ENTRY(RC_GLOBALS_BEGIN + 91) diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h index a0b69b9..92784ba 100644 --- a/sw/inc/helpid.h +++ b/sw/inc/helpid.h @@ -181,7 +181,6 @@ #define HID_INSERT_SECTION_PAGE "SW_HID_INSERT_SECTION_PAGE" #define HID_INSERT_SECTION_DLG "SW_HID_INSERT_SECTION_DLG" #define HID_SECTION_PROPERTIES_DLG "SW_HID_SECTION_PROPERTIES_DLG" -#define HID_RENAME_XNAMED "SW_HID_RENAME_XNAMED" #define HID_TP_TOX_SELECT "SW_HID_TP_TOX_SELECT" #define HID_TP_TOX_ENTRY "SW_HID_TP_TOX_ENTRY" #define HID_TOX_STYLES_PAGE "SW_HID_TOX_STYLES_PAGE" diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx index 17ed47c..d8d2148 100644 --- a/sw/inc/swabstdlg.hxx +++ b/sw/inc/swabstdlg.hxx @@ -386,9 +386,9 @@ public: virtual AbstractSwFldDlg * CreateSwFldDlg ( SfxBindings* pB, SwChildWinWrapper* pCW, Window *pParent, int nResId ) = 0; //add for SwFldDlg virtual SfxAbstractDialog* CreateSwFldEditDlg ( SwView& rVw, int nResId ) = 0; //add for SwFldEditDlg -virtual AbstractSwRenameXNamedDlg * CreateSwRenameXNamedDlg( Window* pParent, //add for SwRenameXNamedDlg - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNamed > & xNamed, - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > & xNameAccess, int nResId ) = 0; +virtual AbstractSwRenameXNamedDlg * CreateSwRenameXNamedDlg(Window* pParent, //add for SwRenameXNamedDlg +::com::sun::star::uno::Reference< ::com::sun::star::container::XNamed > & xNamed, +::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > & xNameAccess) = 0; virtual AbstractSwModalRedlineAcceptDlg * CreateSwModalRedlineAcceptDlg(Window *pParent) = 0; virtual VclAbstractDialog* CreateTblMergeDialog( Window* pParent, sal_Bool& rWithPrev ) = 0; //add for SwMergeTblDlg diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx index 3a4e0c8..6d766bf 100644 --- a/sw/source/ui/dialog/swdlgfact.cxx +++ b/sw/source/ui/dialog/swdlgfact.cxx @@ -1003,23 +1003,12 @@ SfxAbstractDialog* SwAbstractDialogFactory_Impl::CreateSwFldEditDlg ( SwView& return 0; } -AbstractSwRenameXNamedDlg * SwAbstractDialogFactory_Impl::CreateSwRenameXNamedDlg( Window* pParent, - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNamed > & xNamed, -
[Libreoffice-commits] core.git: 2 commits - extras/source sw/uiconfig
extras/source/glade/libreoffice-catalog.xml.in |6 ++ sw/uiconfig/swriter/ui/insertcaption.ui| 69 +++-- 2 files changed, 38 insertions(+), 37 deletions(-) New commits: commit 4dfbd5d06f80813688af46a5c10ea641e320fc2b Author: Caolán McNamara Date: Thu Mar 14 20:52:58 2013 + add in custom category widgets Change-Id: I68eea2cee58edc2e6ab164dcccf6a87b271a403a diff --git a/extras/source/glade/libreoffice-catalog.xml.in b/extras/source/glade/libreoffice-catalog.xml.in index 435449c..40dc276 100644 --- a/extras/source/glade/libreoffice-catalog.xml.in +++ b/extras/source/glade/libreoffice-catalog.xml.in @@ -81,9 +81,15 @@ + + commit 8f645360196182cbd62161c98422acd0560e8eef Author: Caolán McNamara Date: Thu Mar 14 20:49:23 2013 + various efforts to consistently apply HIG rules Change-Id: Ia9452551b57f644226f1ba4c5c9533b679a5 diff --git a/sw/uiconfig/swriter/ui/insertcaption.ui b/sw/uiconfig/swriter/ui/insertcaption.ui index b71a2f7..22ef9b9 100644 --- a/sw/uiconfig/swriter/ui/insertcaption.ui +++ b/sw/uiconfig/swriter/ui/insertcaption.ui @@ -1,15 +1,33 @@ + +1 + +1 +1 +10 + + + + + + + + +[None] + + + False -5 +6 Insert Caption dialog False -2 +12 True @@ -30,7 +48,6 @@ True False 6 -6 12 @@ -71,6 +88,7 @@ True False +6 12 @@ -78,13 +96,15 @@ False True 6 -6 +12 True False start Numbering +True +numbering 0 @@ -98,8 +118,9 @@ True False start -12 Separator +True +separator_edit 0 @@ -113,8 +134,9 @@ True False start -12 Position +True +position 0 @@ -156,8 +178,9 @@ True False start -12 Numbering separator +True +num_seperator_edit 0 @@ -199,8 +222,9 @@ True False start -12 Category +True +category 0 @@ -256,7 +280,6 @@ True False 6 -6 12 @@ -300,13 +323,11 @@ gtk-ok -False True True True True True -False True @@ -318,11 +339,9 @@ gtk-cancel -False True True True -False True @@ -334,11 +353,9 @@ gtk-help -False True True True -False True @@ -350,11 +367,9 @@ Auto... -False True True True -False Fals
[Libreoffice-commits] core.git: 2 commits - extras/source formula/inc formula/source sc/source
extras/source/glade/libreoffice-catalog.xml |7 ++ formula/inc/formula/funcutl.hxx |6 +++-- formula/source/ui/dlg/funcutl.cxx | 31 sc/source/ui/miscdlgs/anyrefdg.cxx |5 4 files changed, 43 insertions(+), 6 deletions(-) New commits: commit b3876e1dc9b05c7e0e02d7a03c372cc2600c7fad Author: Caolán McNamara Date: Tue Mar 5 14:26:18 2013 + another use of the reverse Unique HelpId Hack Change-Id: Ic2d84bc20abda1ad2417d4dfdbe8c8fb09a49efd diff --git a/sc/source/ui/miscdlgs/anyrefdg.cxx b/sc/source/ui/miscdlgs/anyrefdg.cxx index fdffac4..396cf36 100644 --- a/sc/source/ui/miscdlgs/anyrefdg.cxx +++ b/sc/source/ui/miscdlgs/anyrefdg.cxx @@ -668,10 +668,7 @@ ScRefHandler::ScRefHandler( Window &rWindow, SfxBindings* pB, bool bBindRef ): pActiveWin(NULL) { m_aHelper.SetWindow(&m_rWindow); -if(m_rWindow.GetHelpId().isEmpty())//Hack, da im SfxModelessDialog die HelpId -m_rWindow.SetHelpId(m_rWindow.GetUniqueId()); //fuer einen ModelessDialog entfernt und -//in eine UniqueId gewandelt wird, machen -//wir das an dieser Stelle rueckgaengig. +reverseUniqueHelpIdHack(m_rWindow); aTimer.SetTimeout(200); aTimer.SetTimeoutHdl(LINK( this, ScRefHandler, UpdateFocusHdl)); commit a9b33fc3044c001a652865baf6fb870f04c91a96 Author: Caolán McNamara Date: Tue Mar 5 12:53:12 2013 + make formula refButton and refEdit loadable from .ui Change-Id: I2ad13cd8de2c0f8f5672a30c3c1117708368b05f diff --git a/extras/source/glade/libreoffice-catalog.xml b/extras/source/glade/libreoffice-catalog.xml index e3a00b1..ab011a7 100644 --- a/extras/source/glade/libreoffice-catalog.xml +++ b/extras/source/glade/libreoffice-catalog.xml @@ -109,6 +109,13 @@ generic-name="ComboBoxNumeric" parent="VclComboBoxText" icon-name="widget-gtk-comboboxtext"/> + + + diff --git a/formula/inc/formula/funcutl.hxx b/formula/inc/formula/funcutl.hxx index 7144350..1dc10e8 100644 --- a/formula/inc/formula/funcutl.hxx +++ b/formula/inc/formula/funcutl.hxx @@ -44,6 +44,7 @@ protected: public: RefEdit( Window* _pParent,IControlReferenceHandler* pParent, const ResId& rResId ); +RefEdit( Window* _pParent, WinBits nStyle = WB_BORDER ); virtual ~RefEdit(); voidSetRefString( const XubString& rStr ); @@ -84,8 +85,9 @@ protected: virtual voidLoseFocus(); public: -RefButton( Window* _pParent, const ResId& rResId); -RefButton( Window* _pParent, const ResId& rResId, RefEdit* pEdit ,IControlReferenceHandler* pDlg); +RefButton(Window* _pParent, const ResId& rResId); +RefButton(Window* _pParent, WinBits nStyle = 0); +RefButton(Window* _pParent, const ResId& rResId, RefEdit* pEdit ,IControlReferenceHandler* pDlg); voidSetReferences( IControlReferenceHandler* pDlg, RefEdit* pEdit ); diff --git a/formula/source/ui/dlg/funcutl.cxx b/formula/source/ui/dlg/funcutl.cxx index 489e671..4b047d3 100644 --- a/formula/source/ui/dlg/funcutl.cxx +++ b/formula/source/ui/dlg/funcutl.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include #include #include @@ -854,6 +855,19 @@ RefEdit::RefEdit( Window* _pParent,IControlReferenceHandler* pParent, const ResI aTimer.SetTimeout( SC_ENABLE_TIME ); } +RefEdit::RefEdit( Window* _pParent, WinBits nStyle ) : +Edit( _pParent, nStyle ), +pAnyRefDlg( NULL ) +{ +aTimer.SetTimeoutHdl( LINK( this, RefEdit, UpdateHdl ) ); +aTimer.SetTimeout( SC_ENABLE_TIME ); +} + +extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeRefEdit(Window *pParent, VclBuilder::stringmap &) +{ +return new RefEdit(pParent, WB_BORDER); +} + RefEdit::~RefEdit() { aTimer.SetTimeoutHdl( Link() ); @@ -958,6 +972,23 @@ RefButton::RefButton( Window* _pParent, const ResId& rResId) : SetStartImage(); } +RefButton::RefButton( Window* _pParent, WinBits nStyle ) : +ImageButton( _pParent, nStyle ), +aImgRefStart( ModuleRes( RID_BMP_REFBTN1 ) ), +aImgRefDone( ModuleRes( RID_BMP_REFBTN2 ) ), +aShrinkQuickHelp( ModuleRes( RID_STR_SHRINK ).toString() ), +aExpandQuickHelp( ModuleRes( RID_STR_EXPAND ).toString() ), +pAnyRefDlg( NULL ), +pRefEdit( NULL ) +{ +SetStartImage(); +} + +extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeRefButton(Window *pParent, VclBuilder::stringmap &) +{ +return new RefButton(pParent, 0); +} + RefButton::RefButton( Window* _pParent, const ResId& rResId, RefEdit* pEdit, IControlReferenceHandler* _pDlg ) : ImageButton( _pParent, rResId ), aImgRefStart( ModuleRe
[Libreoffice-commits] core.git: 2 commits - extras/source sc/uiconfig vcl/inc vcl/source
extras/source/glade/libreoffice-catalog.xml | 15 +++ sc/uiconfig/scalc/ui/sortoptionspage.ui |3 ++- vcl/inc/vcl/combobox.hxx|4 vcl/inc/vcl/lstbox.hxx |4 vcl/source/control/combobox.cxx | 17 + vcl/source/control/lstbox.cxx | 21 + vcl/source/window/builder.cxx |2 +- 7 files changed, 64 insertions(+), 2 deletions(-) New commits: commit 6c68f2c8edb47d8165521ce97799092ab449a9b7 Author: Caolán McNamara Date: Fri Feb 22 16:54:59 2013 + wrap max-width-chars in a custom widget to avoid it getting dropped silently Change-Id: I7ccbd4b2e1aebc84a59bb9000e7322c8aa62ffd7 diff --git a/extras/source/glade/libreoffice-catalog.xml b/extras/source/glade/libreoffice-catalog.xml index 0612baa..93f4dc6 100644 --- a/extras/source/glade/libreoffice-catalog.xml +++ b/extras/source/glade/libreoffice-catalog.xml @@ -57,5 +57,20 @@ + + + + + +GParamInt +-1 + + The desired maximum width of the ComboBox, in characters + + + + diff --git a/sc/uiconfig/scalc/ui/sortoptionspage.ui b/sc/uiconfig/scalc/ui/sortoptionspage.ui index 2b0a9cc..0fc7eeb 100644 --- a/sc/uiconfig/scalc/ui/sortoptionspage.ui +++ b/sc/uiconfig/scalc/ui/sortoptionspage.ui @@ -164,7 +164,7 @@ - + True False 20 diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx index 264bf92..facb2e5 100644 --- a/vcl/source/window/builder.cxx +++ b/vcl/source/window/builder.cxx @@ -1060,7 +1060,7 @@ Window *VclBuilder::makeObject(Window *pParent, const OString &name, const OStri } else if (name == "GtkLinkButton") pWindow = new FixedHyperlink(pParent, WB_CENTER|WB_VCENTER|WB_3DLOOK|WB_NOLABEL); -else if ((name == "GtkComboBox") || (name == "GtkComboBoxText")) +else if ((name == "GtkComboBox") || (name == "GtkComboBoxText") || (name == "VclComboBoxText")) { extractModel(id, rMap); if (extractEntry(rMap)) commit 7c760f34a00462d5904d0e2eed4132761c2e51c5 Author: Caolán McNamara Date: Fri Feb 22 15:41:00 2013 + Resolves: fdo#60764 sort options can grow too wide to fit on screen Change-Id: Id3aed9ef251f61710b43ceda1a28c6895e91872f diff --git a/sc/uiconfig/scalc/ui/sortoptionspage.ui b/sc/uiconfig/scalc/ui/sortoptionspage.ui index 805e0cc..2b0a9cc 100644 --- a/sc/uiconfig/scalc/ui/sortoptionspage.ui +++ b/sc/uiconfig/scalc/ui/sortoptionspage.ui @@ -168,6 +168,7 @@ True False 20 +72 diff --git a/vcl/inc/vcl/combobox.hxx b/vcl/inc/vcl/combobox.hxx index 33a4382..1a73983 100644 --- a/vcl/inc/vcl/combobox.hxx +++ b/vcl/inc/vcl/combobox.hxx @@ -47,6 +47,7 @@ private: sal_BoolmbDDAutoSize: 1; sal_BoolmbSyntheticModify : 1; sal_BoolmbMatchCase : 1; +sal_Int32 m_nMaxWidthChars; LinkmaSelectHdl; LinkmaDoubleClickHdl; @@ -214,6 +215,9 @@ public: */ using Control::GetIndexForPoint; long GetIndexForPoint( const Point& rPoint, sal_uInt16& rPos ) const; + +sal_Int32 getMaxWidthChars() const { return m_nMaxWidthChars; } +void setMaxWidthChars(sal_Int32 nWidth); }; #endif // _COMBOBOX_HXX diff --git a/vcl/inc/vcl/lstbox.hxx b/vcl/inc/vcl/lstbox.hxx index 694f45c..74dc854 100644 --- a/vcl/inc/vcl/lstbox.hxx +++ b/vcl/inc/vcl/lstbox.hxx @@ -44,6 +44,7 @@ private: sal_uInt16 mnDDHeight; sal_uInt16 mnSaveValue; sal_BoolmbDDAutoSize; +sal_Int32 m_nMaxWidthChars; LinkmaSelectHdl; LinkmaDoubleClickHdl; sal_uInt16 mnLineCount; @@ -219,6 +220,9 @@ public: using Control::GetIndexForPoint; long GetIndexForPoint( const Point& rPoint, sal_uInt16& rPos ) const; +sal_Int32 getMaxWidthChars() const { return m_nMaxWidthChars; } +void setMaxWidthChars(sal_Int32 nWidth); + virtual bool set_property(const rtl::OString &rKey, const rtl::OString &rValue); }; diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx index 673001d..e74d024 100644 --- a/vcl/source/control/combobox.cxx +++ b/vcl/source/control/combobox.cxx @@ -110,6 +110,7 @@ void ComboBox::ImplInitComboBoxData() mbSyntheticModify = sal_False; mbMatchCase = sal_False; mcMultiSep = ';'; +m_nMaxWidthChars= -1; } // -
[Libreoffice-commits] core.git: 2 commits - extras/source sfx2/source
extras/source/glade/libreoffice-catalog.xml |8 +++- sfx2/source/bastyp/fltfnc.cxx |2 +- sfx2/source/doc/docfile.cxx | 10 +- 3 files changed, 13 insertions(+), 7 deletions(-) New commits: commit 45739fad0b1d55e72cc1ed508b8ea33a74219290 Author: Caolán McNamara Date: Fri Feb 22 10:00:42 2013 + fix sfx2 build Change-Id: I17b8ab426e7aabeb5db9d49391e0c1be99e63a51 diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx index 049823b..97dbaec 100644 --- a/sfx2/source/bastyp/fltfnc.cxx +++ b/sfx2/source/bastyp/fltfnc.cxx @@ -551,7 +551,7 @@ sal_uInt32 SfxFilterMatcher::DetectFilter( SfxMedium& rMedium, const SfxFilter** sal_Bool bPreview = rMedium.IsPreview_Impl(); SFX_ITEMSET_ARG(rMedium.GetItemSet(), pReferer, SfxStringItem, SID_REFERER, sal_False); -if ( bPreview && rMedium.IsRemote() && ( !pReferer || pReferer->GetValue().CompareToAscii("private:searchfolder:",21 ) != COMPARE_EQUAL ) ) +if ( bPreview && rMedium.IsRemote() && ( !pReferer || !pReferer->GetValue().match("private:searchfolder:") ) ) return ERRCODE_ABORT; ErrCode nErr = GuessFilter( rMedium, &pFilter ); diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx index d2f6164..0fc15a8 100644 --- a/sfx2/source/doc/docfile.cxx +++ b/sfx2/source/doc/docfile.cxx @@ -1721,12 +1721,12 @@ sal_Bool SfxMedium::TryDirectTransfer( const ::rtl::OUString& aURL, SfxItemSet& SFX_ITEMSET_ARG( &aTargetSet, pNewPassItem, SfxStringItem, SID_PASSWORD, false ); SFX_ITEMSET_ARG( GetItemSet(), pOldPassItem, SfxStringItem, SID_PASSWORD, false ); if ( ( !pNewPassItem && !pOldPassItem ) - || ( pNewPassItem && pOldPassItem && pNewPassItem->GetValue().Equals( pOldPassItem->GetValue() ) ) ) + || ( pNewPassItem && pOldPassItem && pNewPassItem->GetValue() == pOldPassItem->GetValue() ) ) { // the filter must be the same SFX_ITEMSET_ARG( &aTargetSet, pNewFilterItem, SfxStringItem, SID_FILTER_NAME, false ); SFX_ITEMSET_ARG( GetItemSet(), pOldFilterItem, SfxStringItem, SID_FILTER_NAME, false ); -if ( pNewFilterItem && pOldFilterItem && pNewFilterItem->GetValue().Equals( pOldFilterItem->GetValue() ) ) +if ( pNewFilterItem && pOldFilterItem && pNewFilterItem->GetValue() == pOldFilterItem->GetValue() ) { // get the input stream and copy it // in case of success return true @@ -2459,7 +2459,7 @@ void SfxMedium::Init_Impl() pImp->bDisposeStorage = false; SFX_ITEMSET_ARG( pImp->m_pSet, pSalvageItem, SfxStringItem, SID_DOC_SALVAGE, false); -if ( pSalvageItem && !pSalvageItem->GetValue().Len() ) +if ( pSalvageItem && pSalvageItem->GetValue().isEmpty() ) { pSalvageItem = NULL; pImp->m_pSet->ClearItem( SID_DOC_SALVAGE ); @@ -2492,7 +2492,7 @@ void SfxMedium::Init_Impl() } } -if ( pSalvageItem && pSalvageItem->GetValue().Len() ) +if ( pSalvageItem && !pSalvageItem->GetValue().isEmpty() ) { pImp->m_aLogicName = pSalvageItem->GetValue(); DELETEZ( pImp->m_pURLObj ); @@ -2894,7 +2894,7 @@ SfxMedium::SfxMedium( const ::com::sun::star::uno::Sequence< ::com::sun::star::b if( pSalvageItem ) { // QUESTION: there is some treatment of Salvage in Init_Impl; align! -if ( pSalvageItem->GetValue().Len() ) +if ( !pSalvageItem->GetValue().isEmpty() ) { // if an URL is provided in SalvageItem that means that the FileName refers to a temporary file // that must be copied here commit 321bd3a06e3aa78f3223ef1aa7a0baac9176f83d Author: Caolán McNamara Date: Fri Feb 22 09:15:44 2013 + more custom widgets for glade catalog Change-Id: I9637244a7f117496feeb879618a28ba55ced84f4 diff --git a/extras/source/glade/libreoffice-catalog.xml b/extras/source/glade/libreoffice-catalog.xml index e028f73..0612baa 100644 --- a/extras/source/glade/libreoffice-catalog.xml +++ b/extras/source/glade/libreoffice-catalog.xml @@ -30,8 +30,14 @@ + + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits