[Libreoffice-commits] core.git: 3 commits - extras/source
extras/source/autotext/lang/uk/standard/FN/content.xml |6 +++--- extras/source/autotext/lang/uz/standard/FN/content.xml |6 +++--- extras/source/autotext/lang/ve/standard/FN/content.xml |6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) New commits: commit 6954ff54d8bcf7ef028227a561acfbbd13036ba3 Author: Laurent BP AuthorDate: Sun Sep 15 20:26:00 2019 +0200 Commit: Laurent BP CommitDate: Tue Sep 24 21:56:10 2019 +0200 Improve FN AutoText for ve Translate names which appear in Navigator Change-Id: I1a99c43bc97fdf94e8f3d322b057756a7cb32d12 Reviewed-on: https://gerrit.libreoffice.org/78964 Tested-by: Jenkins Reviewed-by: Laurent BP diff --git a/extras/source/autotext/lang/ve/standard/FN/content.xml b/extras/source/autotext/lang/ve/standard/FN/content.xml index b41b40baf853..d9d081b79a4c 100644 --- a/extras/source/autotext/lang/ve/standard/FN/content.xml +++ b/extras/source/autotext/lang/ve/standard/FN/content.xml @@ -34,13 +34,13 @@ - + - + formula @@ -52,4 +52,4 @@ - \ No newline at end of file + commit 7d5cf9f77b5d33c29b25fd9fc8d2f9a1a53292fb Author: Laurent BP AuthorDate: Sun Sep 15 20:20:29 2019 +0200 Commit: Laurent BP CommitDate: Tue Sep 24 21:55:49 2019 +0200 Improve FN AutoText for uz Translate names which appear in Navigator Change-Id: I8497e3777b25f63ba2db86c8e547d29b394a8403 Reviewed-on: https://gerrit.libreoffice.org/78963 Tested-by: Jenkins Reviewed-by: Laurent BP diff --git a/extras/source/autotext/lang/uz/standard/FN/content.xml b/extras/source/autotext/lang/uz/standard/FN/content.xml index b41b40baf853..9e0c4004d743 100644 --- a/extras/source/autotext/lang/uz/standard/FN/content.xml +++ b/extras/source/autotext/lang/uz/standard/FN/content.xml @@ -34,13 +34,13 @@ - + - + formula @@ -52,4 +52,4 @@ - \ No newline at end of file + commit df48c123880126c83ba1b5f8d2e13518f59532a1 Author: Laurent BP AuthorDate: Sun Sep 15 20:13:55 2019 +0200 Commit: Laurent BP CommitDate: Tue Sep 24 21:55:31 2019 +0200 Improve FN AutoText for uk Translate names which appear in Navigator Change-Id: I120f18237215c6bd18f52f8d5fe551a09e398e10 Reviewed-on: https://gerrit.libreoffice.org/78962 Tested-by: Jenkins Reviewed-by: Laurent BP diff --git a/extras/source/autotext/lang/uk/standard/FN/content.xml b/extras/source/autotext/lang/uk/standard/FN/content.xml index b41b40baf853..13aee757b647 100644 --- a/extras/source/autotext/lang/uk/standard/FN/content.xml +++ b/extras/source/autotext/lang/uk/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: 3 commits - extras/source
extras/source/autotext/lang/th/standard/FN/content.xml |6 +++--- extras/source/autotext/lang/tn/standard/FN/content.xml |6 +++--- extras/source/autotext/lang/ts/standard/FN/content.xml |6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) New commits: commit 6c462bb28c151e1390c8e9822a9d9d01c8771e02 Author: Laurent BP AuthorDate: Sun Sep 15 18:01:35 2019 +0200 Commit: Laurent BP CommitDate: Tue Sep 24 21:54:16 2019 +0200 Improve FN AutoText for ts Translate names which appear in Navigator Change-Id: I94d05a49198c4e4092862a931cbbb483c5832b53 Reviewed-on: https://gerrit.libreoffice.org/78958 Tested-by: Jenkins Reviewed-by: Laurent BP diff --git a/extras/source/autotext/lang/ts/standard/FN/content.xml b/extras/source/autotext/lang/ts/standard/FN/content.xml index b41b40baf853..d9d081b79a4c 100644 --- a/extras/source/autotext/lang/ts/standard/FN/content.xml +++ b/extras/source/autotext/lang/ts/standard/FN/content.xml @@ -34,13 +34,13 @@ - + - + formula @@ -52,4 +52,4 @@ - \ No newline at end of file + commit fa484950f67bce9a8d42bcdbb10c32b0bcb15e99 Author: Laurent BP AuthorDate: Sun Sep 15 17:58:38 2019 +0200 Commit: Laurent BP CommitDate: Tue Sep 24 21:53:53 2019 +0200 Improve FN AutoText for tn Translate names which appear in Navigator Change-Id: I9a21ca19b6b2cb519af617c75d80558c374671a2 Reviewed-on: https://gerrit.libreoffice.org/78957 Tested-by: Jenkins Reviewed-by: Laurent BP diff --git a/extras/source/autotext/lang/tn/standard/FN/content.xml b/extras/source/autotext/lang/tn/standard/FN/content.xml index b41b40baf853..be222b5cdf1f 100644 --- a/extras/source/autotext/lang/tn/standard/FN/content.xml +++ b/extras/source/autotext/lang/tn/standard/FN/content.xml @@ -34,13 +34,13 @@ - + - + formula @@ -52,4 +52,4 @@ - \ No newline at end of file + commit f5cc77687eac68316b362fe3a8fb7af5fed5d40a Author: Laurent BP AuthorDate: Sun Sep 15 17:55:39 2019 +0200 Commit: Laurent BP CommitDate: Tue Sep 24 21:53:30 2019 +0200 Improve FN AutoText for th Translate names which appear in Navigator Change-Id: I019d94749eaf058bf637fe0957bd158ffcc91313 Reviewed-on: https://gerrit.libreoffice.org/78956 Tested-by: Jenkins Reviewed-by: Laurent BP diff --git a/extras/source/autotext/lang/th/standard/FN/content.xml b/extras/source/autotext/lang/th/standard/FN/content.xml index b41b40baf853..64c189cc7d52 100644 --- a/extras/source/autotext/lang/th/standard/FN/content.xml +++ b/extras/source/autotext/lang/th/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: 3 commits - extras/source
extras/source/autotext/lang/rw/standard/FN/content.xml|6 +++--- extras/source/autotext/lang/sa-IN/standard/FN/content.xml |6 +++--- extras/source/autotext/lang/sat/standard/FN/content.xml |6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) New commits: commit 921ba20e9b665aa3eaf9569cbf87f2c9d4bf0045 Author: Laurent BP AuthorDate: Sun Sep 15 16:58:21 2019 +0200 Commit: Laurent BP CommitDate: Tue Sep 24 21:47:50 2019 +0200 Improve FN AutoText for sa-IN Translate names which appear in Navigator Change-Id: I73e803f9563fac028dffbd8bcb721ad25c05ad06 Reviewed-on: https://gerrit.libreoffice.org/78943 Tested-by: Jenkins Reviewed-by: Laurent BP diff --git a/extras/source/autotext/lang/sa-IN/standard/FN/content.xml b/extras/source/autotext/lang/sa-IN/standard/FN/content.xml index b41b40baf853..1cd17abb8edf 100644 --- a/extras/source/autotext/lang/sa-IN/standard/FN/content.xml +++ b/extras/source/autotext/lang/sa-IN/standard/FN/content.xml @@ -34,13 +34,13 @@ - + - + formula @@ -52,4 +52,4 @@ - \ No newline at end of file + commit 961ce890196e3e75d884e17853888038ac1f7231 Author: Laurent BP AuthorDate: Sun Sep 15 16:53:47 2019 +0200 Commit: Laurent BP CommitDate: Tue Sep 24 21:47:29 2019 +0200 Improve FN AutoText for sat Translate names which appear in Navigator Change-Id: I5ca0d2326f6fd60c2336e7f3abd5e4d958a6e9ea Reviewed-on: https://gerrit.libreoffice.org/78941 Tested-by: Jenkins Reviewed-by: Laurent BP diff --git a/extras/source/autotext/lang/sat/standard/FN/content.xml b/extras/source/autotext/lang/sat/standard/FN/content.xml index b41b40baf853..01dab5459c29 100644 --- a/extras/source/autotext/lang/sat/standard/FN/content.xml +++ b/extras/source/autotext/lang/sat/standard/FN/content.xml @@ -34,13 +34,13 @@ - + - + formula @@ -52,4 +52,4 @@ - \ No newline at end of file + commit 66eacbc076b3f073d199287b85e9df58eddfd51e Author: Laurent BP AuthorDate: Sun Sep 15 16:32:45 2019 +0200 Commit: Laurent BP CommitDate: Tue Sep 24 21:46:59 2019 +0200 Improve FN AutoText for rw Translate names which appear in Navigator Change-Id: Ia62bd4406a478c20b0f304af35a861a187e11396 Reviewed-on: https://gerrit.libreoffice.org/78939 Tested-by: Jenkins Reviewed-by: Laurent BP diff --git a/extras/source/autotext/lang/rw/standard/FN/content.xml b/extras/source/autotext/lang/rw/standard/FN/content.xml index b41b40baf853..c53bbcbca82d 100644 --- a/extras/source/autotext/lang/rw/standard/FN/content.xml +++ b/extras/source/autotext/lang/rw/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: 3 commits - extras/source
extras/source/autotext/lang/ne/standard/FN/content.xml |6 +++--- extras/source/autotext/lang/nr/standard/FN/content.xml |6 +++--- extras/source/autotext/lang/nso/standard/FN/content.xml |6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) New commits: commit 0e90eecc5cc3755c341713d6d19c304cd262eade Author: Laurent BP AuthorDate: Sun Sep 15 16:07:03 2019 +0200 Commit: Laurent BP CommitDate: Tue Sep 24 21:44:52 2019 +0200 Improve FN AutoText for nso Translate names which appear in Navigator Change-Id: I3d6d7870474412458670f1453150e9b0fbeacc23 Reviewed-on: https://gerrit.libreoffice.org/78933 Tested-by: Jenkins Reviewed-by: Laurent BP diff --git a/extras/source/autotext/lang/nso/standard/FN/content.xml b/extras/source/autotext/lang/nso/standard/FN/content.xml index b41b40baf853..78a710afa04b 100644 --- a/extras/source/autotext/lang/nso/standard/FN/content.xml +++ b/extras/source/autotext/lang/nso/standard/FN/content.xml @@ -34,13 +34,13 @@ - + - + formula @@ -52,4 +52,4 @@ - \ No newline at end of file + commit aab4c2d9bd2a6b043d33373015341334ccf0ca03 Author: Laurent BP AuthorDate: Sun Sep 15 16:03:02 2019 +0200 Commit: Laurent BP CommitDate: Tue Sep 24 21:44:35 2019 +0200 Improve FN AutoText for nr Translate names which appear in Navigator Change-Id: If5d988b9f82dcba1a299d8ff365f433897284586 Reviewed-on: https://gerrit.libreoffice.org/78932 Tested-by: Jenkins Reviewed-by: Laurent BP diff --git a/extras/source/autotext/lang/nr/standard/FN/content.xml b/extras/source/autotext/lang/nr/standard/FN/content.xml index b41b40baf853..d9d081b79a4c 100644 --- a/extras/source/autotext/lang/nr/standard/FN/content.xml +++ b/extras/source/autotext/lang/nr/standard/FN/content.xml @@ -34,13 +34,13 @@ - + - + formula @@ -52,4 +52,4 @@ - \ No newline at end of file + commit 9fbaa60c434cbace063a614772ede4cf83cbeaff Author: Laurent BP AuthorDate: Sun Sep 15 15:54:52 2019 +0200 Commit: Laurent BP CommitDate: Tue Sep 24 21:44:14 2019 +0200 Improve FN AutoText for ne Translate names which appear in Navigator Change-Id: Iae18e7b16095017f1c28356fd2b064faa5bbf606 Reviewed-on: https://gerrit.libreoffice.org/78931 Tested-by: Jenkins Reviewed-by: Laurent BP diff --git a/extras/source/autotext/lang/ne/standard/FN/content.xml b/extras/source/autotext/lang/ne/standard/FN/content.xml index b41b40baf853..f9aaff61b279 100644 --- a/extras/source/autotext/lang/ne/standard/FN/content.xml +++ b/extras/source/autotext/lang/ne/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: 3 commits - extras/source
extras/source/autotext/lang/mai/standard/FN/content.xml |6 +++--- extras/source/autotext/lang/mk/standard/FN/content.xml |6 +++--- extras/source/autotext/lang/ml/standard/FN/content.xml |6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) New commits: commit 80b639733232ba3caff0277f6704c29fe099ccf8 Author: Laurent BP AuthorDate: Sat Sep 14 21:04:10 2019 +0200 Commit: Laurent BP CommitDate: Tue Sep 24 21:41:16 2019 +0200 Improve FN AutoText for ml Translate names which appear in Navigator Change-Id: Ib9e554b24b20938cc38674cc9056aed242905a67 Reviewed-on: https://gerrit.libreoffice.org/78918 Tested-by: Jenkins Reviewed-by: Laurent BP diff --git a/extras/source/autotext/lang/ml/standard/FN/content.xml b/extras/source/autotext/lang/ml/standard/FN/content.xml index b41b40baf853..1164778323f0 100644 --- a/extras/source/autotext/lang/ml/standard/FN/content.xml +++ b/extras/source/autotext/lang/ml/standard/FN/content.xml @@ -34,13 +34,13 @@ - + - + formula @@ -52,4 +52,4 @@ - \ No newline at end of file + commit 087c9b770ef59e4227632d4bbea847bff98c917d Author: Laurent BP AuthorDate: Sat Sep 14 21:00:30 2019 +0200 Commit: Laurent BP CommitDate: Tue Sep 24 21:40:55 2019 +0200 Improve FN AutoText for mk Translate names which appear in Navigator Change-Id: I3ed3f5a3bb2f819e710914d1f9f6d9de741af35d Reviewed-on: https://gerrit.libreoffice.org/78917 Tested-by: Jenkins Reviewed-by: Laurent BP diff --git a/extras/source/autotext/lang/mk/standard/FN/content.xml b/extras/source/autotext/lang/mk/standard/FN/content.xml index b41b40baf853..972935af2278 100644 --- a/extras/source/autotext/lang/mk/standard/FN/content.xml +++ b/extras/source/autotext/lang/mk/standard/FN/content.xml @@ -34,13 +34,13 @@ - + - + formula @@ -52,4 +52,4 @@ - \ No newline at end of file + commit e7b059cf84e3b3703f99f0f94b12637452081489 Author: Laurent BP AuthorDate: Sat Sep 14 20:55:14 2019 +0200 Commit: Laurent BP CommitDate: Tue Sep 24 21:40:31 2019 +0200 Improve FN AutoText for mai Translate names which appear in Navigator Change-Id: I07e85d7eb2c9e7b66e0fb7afe96286cc3ecc4ed0 Reviewed-on: https://gerrit.libreoffice.org/78916 Tested-by: Jenkins Reviewed-by: Laurent BP diff --git a/extras/source/autotext/lang/mai/standard/FN/content.xml b/extras/source/autotext/lang/mai/standard/FN/content.xml index b41b40baf853..1cd17abb8edf 100644 --- a/extras/source/autotext/lang/mai/standard/FN/content.xml +++ b/extras/source/autotext/lang/mai/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: 3 commits - extras/source
extras/source/autotext/lang/kmr-Latn/standard/FN/content.xml |6 +++--- extras/source/autotext/lang/kn/standard/FN/content.xml |6 +++--- extras/source/autotext/lang/kok/standard/FN/content.xml |6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) New commits: commit a3b9ec4ce916f1396109aa095321f9648913d5a0 Author: Laurent BP AuthorDate: Sat Sep 14 19:23:46 2019 +0200 Commit: Laurent BP CommitDate: Tue Sep 24 21:38:28 2019 +0200 Improve FN AutoText for kok Translate names which appear in Navigator Change-Id: I39499a8b670bec5bfa50ce3cb21972a4f84c6836 Reviewed-on: https://gerrit.libreoffice.org/78909 Tested-by: Jenkins Reviewed-by: Laurent BP diff --git a/extras/source/autotext/lang/kok/standard/FN/content.xml b/extras/source/autotext/lang/kok/standard/FN/content.xml index b41b40baf853..ef7cdd041fc8 100644 --- a/extras/source/autotext/lang/kok/standard/FN/content.xml +++ b/extras/source/autotext/lang/kok/standard/FN/content.xml @@ -34,13 +34,13 @@ - + - + formula @@ -52,4 +52,4 @@ - \ No newline at end of file + commit 8a5cc2fbf5c1e1c89d7c58d78c570c720b5ab82d Author: Laurent BP AuthorDate: Sat Sep 14 19:18:49 2019 +0200 Commit: Laurent BP CommitDate: Tue Sep 24 21:38:03 2019 +0200 Improve FN AutoText for kn Translate names which appear in Navigator Change-Id: Ibbe4609a584dad0769a27d6852361393a0d3b91e Reviewed-on: https://gerrit.libreoffice.org/78908 Tested-by: Jenkins Reviewed-by: Laurent BP diff --git a/extras/source/autotext/lang/kn/standard/FN/content.xml b/extras/source/autotext/lang/kn/standard/FN/content.xml index b41b40baf853..76b55218a056 100644 --- a/extras/source/autotext/lang/kn/standard/FN/content.xml +++ b/extras/source/autotext/lang/kn/standard/FN/content.xml @@ -34,13 +34,13 @@ - + - + formula @@ -52,4 +52,4 @@ - \ No newline at end of file + commit fda8233c08ba78c29a13ad78ca6d6eb7642e2018 Author: Laurent BP AuthorDate: Sat Sep 14 19:14:59 2019 +0200 Commit: Laurent BP CommitDate: Tue Sep 24 21:37:39 2019 +0200 Improve FN AutoText for kmr-Latn Translate names which appear in Navigator Change-Id: I31a5530c51edcaa57f5ea605c0512210b20f3c1e Reviewed-on: https://gerrit.libreoffice.org/78907 Tested-by: Jenkins Reviewed-by: Laurent BP diff --git a/extras/source/autotext/lang/kmr-Latn/standard/FN/content.xml b/extras/source/autotext/lang/kmr-Latn/standard/FN/content.xml index b41b40baf853..ea77d3e779f6 100644 --- a/extras/source/autotext/lang/kmr-Latn/standard/FN/content.xml +++ b/extras/source/autotext/lang/kmr-Latn/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: 3 commits - extras/source
extras/source/autotext/lang/cy/standard/FN/content.xml |6 +++--- extras/source/autotext/lang/dgo/standard/FN/content.xml |6 +++--- extras/source/autotext/lang/dsb/standard/FN/content.xml |6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) New commits: commit 101d32a6f2f8bda09a52679ce0f542e62e40716e Author: Laurent BP AuthorDate: Fri Sep 13 20:21:25 2019 +0200 Commit: Laurent BP CommitDate: Tue Sep 24 21:26:55 2019 +0200 Improve FN AutoText for dsb Translate names which appear in Navigator Change-Id: I5813a197805ce6a1e2e5c6f9dfa1821a2c9adab3 Reviewed-on: https://gerrit.libreoffice.org/78883 Tested-by: Jenkins Reviewed-by: Laurent BP diff --git a/extras/source/autotext/lang/dsb/standard/FN/content.xml b/extras/source/autotext/lang/dsb/standard/FN/content.xml index b41b40baf853..9b087c796603 100644 --- a/extras/source/autotext/lang/dsb/standard/FN/content.xml +++ b/extras/source/autotext/lang/dsb/standard/FN/content.xml @@ -34,13 +34,13 @@ - + - + formula @@ -52,4 +52,4 @@ - \ No newline at end of file + commit 68777d0a6732f194acac08c06fd46f98334e8e71 Author: Laurent BP AuthorDate: Fri Sep 13 20:11:15 2019 +0200 Commit: Laurent BP CommitDate: Tue Sep 24 21:26:06 2019 +0200 Improve FN AutoText for dgo Translate names which appear in Navigator Change-Id: Iea6c6444df3086a5e6645ef3402c45dd6d118fdc Reviewed-on: https://gerrit.libreoffice.org/78882 Tested-by: Jenkins Reviewed-by: Laurent BP diff --git a/extras/source/autotext/lang/dgo/standard/FN/content.xml b/extras/source/autotext/lang/dgo/standard/FN/content.xml index b41b40baf853..1db39056ea17 100644 --- a/extras/source/autotext/lang/dgo/standard/FN/content.xml +++ b/extras/source/autotext/lang/dgo/standard/FN/content.xml @@ -34,13 +34,13 @@ - + - + formula @@ -52,4 +52,4 @@ - \ No newline at end of file + commit 67beb5b87d1a09fd997ec03ed2d78c3ab69137cc Author: Laurent BP AuthorDate: Fri Sep 13 20:02:33 2019 +0200 Commit: Laurent BP CommitDate: Tue Sep 24 21:25:29 2019 +0200 Improve FN AutoText for cy Translate names which appear in Navigator Change-Id: I9ce3b7d8056cdfd39586c6e2c7406a2f40701659 Reviewed-on: https://gerrit.libreoffice.org/78881 Tested-by: Jenkins Reviewed-by: Laurent BP diff --git a/extras/source/autotext/lang/cy/standard/FN/content.xml b/extras/source/autotext/lang/cy/standard/FN/content.xml index b41b40baf853..e86ac5d40a27 100644 --- a/extras/source/autotext/lang/cy/standard/FN/content.xml +++ b/extras/source/autotext/lang/cy/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: 3 commits - extras/source sc/source
extras/source/autotext/lang/am/standard/FN/content.xml |6 ++--- extras/source/autotext/lang/ar/standard/FN/content.xml |6 ++--- sc/source/ui/app/scmod.cxx | 19 +++-- 3 files changed, 23 insertions(+), 8 deletions(-) New commits: commit 8e358c73b5f5e7423e0eb85c6f5e76d07457c060 Author: Laurent BP AuthorDate: Thu Sep 12 21:25:53 2019 +0200 Commit: Laurent BP CommitDate: Tue Sep 24 21:18:49 2019 +0200 Improve FN AutoText for ar Translate names which appear in Navigator Change-Id: Iab965081761885c9ba4cb4d3deef056fef75c612 Reviewed-on: https://gerrit.libreoffice.org/78842 Tested-by: Jenkins Reviewed-by: Laurent BP diff --git a/extras/source/autotext/lang/ar/standard/FN/content.xml b/extras/source/autotext/lang/ar/standard/FN/content.xml index b41b40baf853..33e5cad3fc6b 100644 --- a/extras/source/autotext/lang/ar/standard/FN/content.xml +++ b/extras/source/autotext/lang/ar/standard/FN/content.xml @@ -34,13 +34,13 @@ - + - + formula @@ -52,4 +52,4 @@ - \ No newline at end of file + commit 55167fb88d98b606dd61fe71507d0b6ddd7524b3 Author: Laurent BP AuthorDate: Thu Sep 12 21:17:56 2019 +0200 Commit: Laurent BP CommitDate: Tue Sep 24 21:18:21 2019 +0200 Improve FN AutoText for am Translate names which appear in Navigator Change-Id: I2d837475006c158325fc6ab38c80307eea9d5314 Reviewed-on: https://gerrit.libreoffice.org/78841 Tested-by: Jenkins Reviewed-by: Laurent BP diff --git a/extras/source/autotext/lang/am/standard/FN/content.xml b/extras/source/autotext/lang/am/standard/FN/content.xml index b41b40baf853..7e1d4a225195 100644 --- a/extras/source/autotext/lang/am/standard/FN/content.xml +++ b/extras/source/autotext/lang/am/standard/FN/content.xml @@ -34,13 +34,13 @@ - + - + formula @@ -52,4 +52,4 @@ - \ No newline at end of file + commit 240ec23841cc1e9728f9273d88c1f9a170cf3fb8 Author: Szymon Kłos AuthorDate: Tue Nov 6 09:43:11 2018 +0100 Commit: Michael Meeks CommitDate: Tue Sep 24 21:18:00 2019 +0200 Keep reference mode if only one dialog closed Change-Id: I9cf7988da7f83c28a0919c69ace131ee93054486 Reviewed-on: https://gerrit.libreoffice.org/79466 Tested-by: Jenkins Reviewed-by: Michael Meeks diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx index d8eb515e8eda..e21a83310256 100644 --- a/sc/source/ui/app/scmod.cxx +++ b/sc/source/ui/app/scmod.cxx @@ -1483,7 +1483,16 @@ void ScModule::SetRefDialog( sal_uInt16 nId, bool bVis, SfxViewFrame* pViewFrm ) //if ( pViewFrm ) // pViewFrm->GetBindings().Update(); // to avoid trouble in LockDispatcher -m_nCurRefDlgId = bVis ? nId : 0 ; // before SetChildWindow +// before SetChildWindow +if ( comphelper::LibreOfficeKit::isActive() ) +{ +if ( bVis ) +m_nCurRefDlgId = nId; +} +else +{ +m_nCurRefDlgId = bVis ? nId : 0; +} if ( pViewFrm ) { @@ -1753,7 +1762,13 @@ void ScModule::EndReference() //FIXME: ShowRefFrame at InputHdl, if the Function AutoPilot is open? if ( m_nCurRefDlgId ) { -SfxChildWindow* pChildWnd = lcl_GetChildWinFromAnyView( m_nCurRefDlgId ); +SfxChildWindow* pChildWnd = nullptr; + +if ( comphelper::LibreOfficeKit::isActive() ) +pChildWnd = lcl_GetChildWinFromCurrentView( m_nCurRefDlgId ); +else +pChildWnd = lcl_GetChildWinFromAnyView( m_nCurRefDlgId ); + OSL_ENSURE( pChildWnd, "NoChildWin" ); if ( pChildWnd ) { ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - extras/source unotools/source
extras/source/truetype/symbol/OpenSymbol.sfd | 563 +-- extras/source/truetype/symbol/README |5 unotools/source/misc/fontcvt.cxx | 10 3 files changed, 291 insertions(+), 287 deletions(-) New commits: commit 4034babeb51af323ff2a47642e3a1386fc1d6b46 Author: Khaled HosnyDate: Fri Nov 18 13:40:04 2016 +0200 Make this look less wired Change-Id: I20b6a5e6ecdf48e1ca8df2e7e86248eae666c9f1 diff --git a/unotools/source/misc/fontcvt.cxx b/unotools/source/misc/fontcvt.cxx index e42c9b3..b48f210 100644 --- a/unotools/source/misc/fontcvt.cxx +++ b/unotools/source/misc/fontcvt.cxx @@ -1353,7 +1353,10 @@ const ConvertChar* ConvertChar::GetRecodeData( const OUString& rOrgFontName, con { const RecodeTable& r = aStarSymbolRecodeTable[i]; if( aOrgName.equalsAscii( r.pOrgName ) ) -{ pCvt = break; } +{ +pCvt = +break; +} } } //It's plausible that it's better to implement this @@ -1366,7 +1369,10 @@ const ConvertChar* ConvertChar::GetRecodeData( const OUString& rOrgFontName, con { const RecodeTable& r = aAppleSymbolRecodeTable[i]; if( aOrgName.equalsAscii( r.pOrgName ) ) -{ pCvt = break; } +{ +pCvt = +break; +} } } else if( aMapName == "starbats" ) commit 0fce641f550f7d545762fe84f745507d94206e34 Author: Khaled Hosny Date: Fri Nov 18 04:47:52 2016 +0200 Minor changes to simplify editing in FontForge Show glyph in the final font order, and use a bigger view size. No functional changes. Change-Id: I28b1ba00adccb9f7599f393395b5504d2b86f473 diff --git a/extras/source/truetype/symbol/OpenSymbol.sfd b/extras/source/truetype/symbol/OpenSymbol.sfd index f700705..ac9e2c8 100644 --- a/extras/source/truetype/symbol/OpenSymbol.sfd +++ b/extras/source/truetype/symbol/OpenSymbol.sfd @@ -10,6 +10,7 @@ UnderlinePosition: -143 UnderlineWidth: 20 Ascent: 1638 Descent: 410 +InvalidEm: 0 LayerCount: 2 Layer: 0 1 "Back" 1 Layer: 1 1 "Fore" 0 @@ -774,19 +775,19 @@ ShortTable: maxp 16 EndShort LangName: 1033 "" "" "Regular" "OpenSymbol" GaspTable: 1 65535 2 0 -Encoding: Custom +Encoding: Original UnicodeInterp: none NameList: Adobe Glyph List -DisplaySize: -24 +DisplaySize: -72 AntiAlias: 1 FitToEm: 1 -WinInfo: 675 45 15 +WinInfo: 0 34 12 BeginPrivate: 0 EndPrivate -BeginChars: 8834 1031 +BeginChars: 1031 1031 StartChar: Alpha -Encoding: 909 913 0 +Encoding: 0 913 0 Width: 1572 Flags: W HStem: 1 31<31 104.324 353.571 463 979 1080.42 1443.74 1530> 447 66<460.172 977.603> @@ -867,7 +868,7 @@ Validated: 16385 EndChar StartChar: Beta -Encoding: 910 914 1 +Encoding: 1 914 1 Width: 1383 GlyphClass: 2 Flags: W @@ -1029,7 +1030,7 @@ Validated: 16385 EndChar StartChar: Gamma -Encoding: 911 915 2 +Encoding: 2 915 2 Width: 1280 GlyphClass: 2 Flags: W @@ -1141,7 +1142,7 @@ Validated: 16385 EndChar StartChar: nounicode-3-1-c -Encoding: 0 12 3 +Encoding: 3 12 3 Width: 1024 GlyphClass: 2 Flags: W @@ -1149,7 +1150,7 @@ LayerCount: 2 EndChar StartChar: nounicode-3-1-d -Encoding: 1 13 4 +Encoding: 4 13 4 Width: 1024 GlyphClass: 2 Flags: W @@ -1157,7 +1158,7 @@ LayerCount: 2 EndChar StartChar: space -Encoding: 2 32 5 +Encoding: 5 32 5 Width: 1024 GlyphClass: 2 Flags: W @@ -1165,7 +1166,7 @@ LayerCount: 2 EndChar StartChar: exclam -Encoding: 3 33 6 +Encoding: 6 33 6 Width: 606 GlyphClass: 2 Flags: W @@ -1244,7 +1245,7 @@ Validated: 1 EndChar StartChar: quotedbl -Encoding: 4 34 7 +Encoding: 7 34 7 Width: 727 GlyphClass: 2 Flags: W @@ -1346,7 +1347,7 @@ Validated: 1 EndChar StartChar: numbersign -Encoding: 5 35 8 +Encoding: 8 35 8 Width: 1138 GlyphClass: 2 Flags: W @@ -1660,7 +1661,7 @@ Validated: 1 EndChar StartChar: percent -Encoding: 6 37 9 +Encoding: 9 37 9 Width: 1705 GlyphClass: 2 Flags: W @@ -1838,7 +1839,7 @@ Validated: 1 EndChar StartChar: ampersand -Encoding: 7 38 10 +Encoding: 10 38 10 Width: 1593 GlyphClass: 2 Flags: W @@ -2041,7 +2042,7 @@ Validated: 1 EndChar StartChar: parenleft -Encoding: 8 40 11 +Encoding: 11 40 11 Width: 696 GlyphClass: 2 Flags: W @@ -2095,7 +2096,7 @@ Validated: 1 EndChar StartChar: parenright -Encoding: 9 41 12 +Encoding: 12 41 12 Width: 696 GlyphClass: 2 Flags: W @@ -2150,7 +2151,7 @@ Validated: 1 EndChar StartChar: asterisk -Encoding: 10 42 13 +Encoding: 13 42 13 Width: 796 GlyphClass: 2 Flags: W @@ -2229,7 +2230,7 @@ Validated: 1 EndChar StartChar: plus -Encoding: 11 43 14 +Encoding: 14 43 14 Width: 1196 GlyphClass: 2 Flags: W @@ -2338,7 +2339,7 @@ Validated: 1 EndChar StartChar: comma -Encoding: 12 44 15 +Encoding: 15 44 15 Width: 512 GlyphClass: 2 Flags: W @@ -2417,7 +2418,7 @@ Validated: 1 EndChar
[Libreoffice-commits] core.git: 3 commits - extras/source sd/AllLangResTarget_sd.mk sd/inc sd/source sd/uiconfig sd/UIConfig_sdraw.mk sd/UIConfig_simpress.mk vcl/inc vcl/source
extras/source/glade/libreoffice-catalog.xml.in |4 + sd/AllLangResTarget_sd.mk |2 sd/UIConfig_sdraw.mk |1 sd/UIConfig_simpress.mk|1 sd/inc/glob.hrc|1 sd/source/core/glob.src|5 + sd/source/ui/dlg/RemoteDialog.cxx | 30 +++-- sd/source/ui/dlg/RemoteDialog.hxx |8 -- sd/source/ui/dlg/RemoteDialog.src | 56 - sd/source/ui/dlg/RemoteDialogClientBox.cxx | 73 +-- sd/source/ui/dlg/RemoteDialogClientBox.hxx |6 - sd/source/ui/dlg/dlgolbul.cxx | 58 -- sd/source/ui/dlg/dlgolbul.src | 63 sd/source/ui/inc/OutlineBulletDlg.hxx | 10 +-- sd/source/ui/inc/RemoteDialog.hrc | 18 - sd/source/ui/inc/dlgolbul.hrc | 21 -- sd/source/ui/table/TableDesignPane.cxx | 16 + sd/uiconfig/simpress/ui/remotedialog.ui| 78 + vcl/inc/svids.hrc |1 vcl/source/src/btntext.src |5 + vcl/source/window/builder.cxx |2 21 files changed, 194 insertions(+), 265 deletions(-) New commits: commit 2d1782250088280425833c060513245bf3defed7 Author: Caolán McNamara caol...@redhat.com Date: Fri Nov 15 11:21:30 2013 + convert bullets and numbering dialog to .ui Change-Id: I303684cd0d4e2f3092cc776cd0b77725d6741bc6 diff --git a/sd/AllLangResTarget_sd.mk b/sd/AllLangResTarget_sd.mk index 895bdbb..45d874e 100644 --- a/sd/AllLangResTarget_sd.mk +++ b/sd/AllLangResTarget_sd.mk @@ -44,7 +44,6 @@ $(eval $(call gb_SrsTarget_add_files,sd/res,\ sd/source/ui/dlg/animobjs.src \ sd/source/ui/dlg/dlgass.src \ sd/source/ui/dlg/dlgfield.src \ -sd/source/ui/dlg/dlgolbul.src \ sd/source/ui/dlg/LayerDialog.src \ sd/source/ui/dlg/navigatr.src \ sd/source/ui/dlg/PaneDockingWindow.src \ diff --git a/sd/UIConfig_sdraw.mk b/sd/UIConfig_sdraw.mk index 90c2448..228a4d7 100644 --- a/sd/UIConfig_sdraw.mk +++ b/sd/UIConfig_sdraw.mk @@ -67,6 +67,7 @@ $(eval $(call gb_UIConfig_add_toolbarfiles,modules/sdraw,\ $(eval $(call gb_UIConfig_add_uifiles,modules/sdraw,\ sd/uiconfig/sdraw/ui/breakdialog \ + sd/uiconfig/sdraw/ui/bulletsandnumbering \ sd/uiconfig/sdraw/ui/crossfadedialog \ sd/uiconfig/sdraw/ui/dlgsnap \ sd/uiconfig/sdraw/ui/copydlg \ diff --git a/sd/source/ui/dlg/dlgolbul.cxx b/sd/source/ui/dlg/dlgolbul.cxx index a09b92e..a03ae76 100644 --- a/sd/source/ui/dlg/dlgolbul.cxx +++ b/sd/source/ui/dlg/dlgolbul.cxx @@ -38,7 +38,6 @@ #include sdresid.hxx #include glob.hrc -#include dlgolbul.hrc #include bulmaper.hxx #include DrawDocShell.hxx #include svl/aeitem.hxx @@ -52,13 +51,12 @@ OutlineBulletDlg::OutlineBulletDlg( ::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView ) -: SfxTabDialog ( pParent, SdResId(TAB_OUTLINEBULLET) ), - aInputSet ( *pAttr ), - bTitle( sal_False ), - pSdView ( pView ) +: SfxTabDialog( pParent, BulletsAndNumberingDialog, +modules/sdraw/ui/bulletsandnumbering.ui) +, aInputSet( *pAttr ) +, bTitle(false) +, pSdView(pView) { -FreeResource(); - aInputSet.MergeRange( SID_PARAM_NUM_PRESET, SID_PARAM_CUR_NUM_LEVEL ); aInputSet.Put( *pAttr ); @@ -128,15 +126,14 @@ OutlineBulletDlg::OutlineBulletDlg( SetInputSet( aInputSet ); if(!bTitle) -AddTabPage(RID_SVXPAGE_PICK_SINGLE_NUM); +AddTabPage(singlenum, RID_SVXPAGE_PICK_SINGLE_NUM); else -RemoveTabPage( RID_SVXPAGE_PICK_SINGLE_NUM ); - -AddTabPage( RID_SVXPAGE_PICK_BULLET ); -AddTabPage( RID_SVXPAGE_PICK_BMP ); -AddTabPage(RID_SVXPAGE_NUM_OPTIONS ); -AddTabPage(RID_SVXPAGE_NUM_POSITION ); +RemoveTabPage(singlenum); +AddTabPage(bullets, RID_SVXPAGE_PICK_BULLET); +AddTabPage(graphics, RID_SVXPAGE_PICK_BMP); +m_nOptionsId = AddTabPage(customize, RID_SVXPAGE_NUM_OPTIONS); +m_nPositionId = AddTabPage(position, RID_SVXPAGE_NUM_POSITION); } OutlineBulletDlg::~OutlineBulletDlg() @@ -146,30 +143,25 @@ OutlineBulletDlg::~OutlineBulletDlg() void OutlineBulletDlg::PageCreated( sal_uInt16 nId, SfxTabPage rPage ) { -switch ( nId ) +if (nId == m_nOptionsId) { -case RID_SVXPAGE_NUM_OPTIONS: +if( pSdView ) { -if( pSdView ) -{ -FieldUnit eMetric = pSdView-GetDoc().GetUIUnit(); -SfxAllItemSet aSet(*(GetInputSetImpl()-GetPool())); -aSet.Put ( SfxAllEnumItem(SID_METRIC_ITEM,(sal_uInt16)eMetric)); -rPage.PageCreated(aSet); -} +FieldUnit eMetric = pSdView-GetDoc().GetUIUnit(); +
[Libreoffice-commits] core.git: 3 commits - extras/source sd/AllLangResTarget_sd.mk sd/inc sd/source sd/uiconfig sd/UIConfig_sdraw.mk sw/inc sw/source
extras/source/glade/libreoffice-catalog.xml.in |3 sd/AllLangResTarget_sd.mk |1 sd/UIConfig_sdraw.mk |1 sd/inc/helpids.h |3 sd/source/ui/dlg/inspagob.cxx | 59 -- sd/source/ui/dlg/inspagob.src | 76 - sd/source/ui/dlg/sdtreelb.cxx | 39 ++ sd/source/ui/inc/inspagob.hrc | 27 sd/source/ui/inc/inspagob.hxx |9 - sd/source/ui/inc/sdtreelb.hxx |3 sd/source/ui/remotecontrol/BluetoothServer.cxx |2 sd/uiconfig/sdraw/ui/insertslidesdialog.ui | 145 + sw/inc/ndtxt.hxx | 12 +- sw/source/core/crsr/crstrvl.cxx|2 sw/source/core/doc/docnum.cxx |4 sw/source/core/edit/edattr.cxx |2 sw/source/core/fields/expfld.cxx |2 sw/source/core/fields/reffld.cxx |2 sw/source/core/tox/txmsrt.cxx | 10 - sw/source/core/txtnode/ndtxt.cxx | 16 +- sw/source/ui/uno/unotxdoc.cxx |2 21 files changed, 245 insertions(+), 175 deletions(-) New commits: commit 904fe66ce17f24d8c81130ca204ee3c5cbf52802 Author: Caolán McNamara caol...@redhat.com Date: Thu Nov 14 11:04:59 2013 + downgrade sdremote.bluetooth warning to info Change-Id: Iec39551dafead84f4f0ad246e7e1d1ad16e15b4a diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx b/sd/source/ui/remotecontrol/BluetoothServer.cxx index 54bc85a..63407a6 100644 --- a/sd/source/ui/remotecontrol/BluetoothServer.cxx +++ b/sd/source/ui/remotecontrol/BluetoothServer.cxx @@ -170,7 +170,7 @@ bluezGetDefaultService( DBusConnection *pConnection ) return NULL; if( DBUS_TYPE_OBJECT_PATH != dbus_message_iter_get_arg_type( it ) ) -SAL_WARN( sdremote.bluetooth, invalid type of reply to DefaultAdapter: ' +SAL_INFO( sdremote.bluetooth, invalid type of reply to DefaultAdapter: ' dbus_message_iter_get_arg_type( it ) ' ); else { commit f13a47fa04db2e8c653df8adf8249a89ca06b291 Author: Caolán McNamara caol...@redhat.com Date: Thu Nov 14 10:40:16 2013 + convert insert slides dialog to .ui Change-Id: I9dc8366d2e8bd2ab16ce11c9e69cbdbdca0ccae5 diff --git a/extras/source/glade/libreoffice-catalog.xml.in b/extras/source/glade/libreoffice-catalog.xml.in index 6344078..487ff00c 100644 --- a/extras/source/glade/libreoffice-catalog.xml.in +++ b/extras/source/glade/libreoffice-catalog.xml.in @@ -421,6 +421,9 @@ glade-widget-class title=Tab Order ListBox name=pcrlo-TabOrderListBox generic-name=TabOrderListBox parent=svtlo-SvTreeListBox icon-name=widget-gtk-treeview/ +glade-widget-class title=Page Objs ListBox name=sdlo-SdPageObjsTLB +generic-name=SdPageObjsTLB parent=svtlo-SvTreeListBox +icon-name=widget-gtk-treeview/ glade-widget-class title=Checked Tree List name=svxlo-SvxCheckListBox generic-name=Checked Tree List parent=GtkTreeView icon-name=widget-gtk-treeview/ diff --git a/sd/AllLangResTarget_sd.mk b/sd/AllLangResTarget_sd.mk index b988697..3e36039 100644 --- a/sd/AllLangResTarget_sd.mk +++ b/sd/AllLangResTarget_sd.mk @@ -45,7 +45,6 @@ $(eval $(call gb_SrsTarget_add_files,sd/res,\ sd/source/ui/dlg/dlgass.src \ sd/source/ui/dlg/dlgfield.src \ sd/source/ui/dlg/dlgolbul.src \ -sd/source/ui/dlg/inspagob.src \ sd/source/ui/dlg/LayerDialog.src \ sd/source/ui/dlg/morphdlg.src \ sd/source/ui/dlg/navigatr.src \ diff --git a/sd/UIConfig_sdraw.mk b/sd/UIConfig_sdraw.mk index a578a2d..51c9726 100644 --- a/sd/UIConfig_sdraw.mk +++ b/sd/UIConfig_sdraw.mk @@ -74,6 +74,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/sdraw,\ sd/uiconfig/sdraw/ui/drawpagedialog \ sd/uiconfig/sdraw/ui/drawprtldialog \ sd/uiconfig/sdraw/ui/insertlayer \ + sd/uiconfig/sdraw/ui/insertslidesdialog \ sd/uiconfig/sdraw/ui/namedesign \ sd/uiconfig/sdraw/ui/paranumberingtab \ sd/uiconfig/sdraw/ui/printeroptions \ diff --git a/sd/inc/helpids.h b/sd/inc/helpids.h index 3d6aabf..1bab9f8 100644 --- a/sd/inc/helpids.h +++ b/sd/inc/helpids.h @@ -101,8 +101,6 @@ #define HID_SD_UNDODELETEWARNING_DLG SD_HID_SD_UNDODELETEWARNING_DLG #define HID_SD_UNDODELETEWARNING_CBX SD_HID_SD_UNDODELETEWARNING_CBX -#define HID_SD_PAGEOBJSTLB SD_HID_SD_PAGEOBJSTLB - #define HID_SD_NAMEDIALOG_OBJECT SD_HID_SD_NAMEDIALOG_OBJECT #define HID_SD_NAMEDIALOG_PAGE SD_HID_SD_NAMEDIALOG_PAGE #define
[Libreoffice-commits] core.git: 3 commits - extras/source include/sfx2 include/svtools include/svx svtools/source svx/source sw/AllLangResTarget_sw.mk sw/inc sw/source sw/uiconfig sw/UIConfig_swriter.
extras/source/glade/libreoffice-catalog.xml.in |4 include/sfx2/tabdlg.hxx|6 include/svtools/editbrowsebox.hxx |2 include/svx/gridctrl.hxx |4 svtools/source/brwbox/editbrowsebox.cxx|2 svx/source/fmcomp/gridctrl.cxx |8 sw/AllLangResTarget_sw.mk |1 sw/UIConfig_swriter.mk |1 sw/inc/helpid.h|2 sw/inc/ndgrf.hxx | 18 -- sw/inc/ndole.hxx |9 - sw/source/ui/fldui/flddinf.cxx | 162 +-- sw/source/ui/fldui/flddinf.hxx | 16 - sw/source/ui/fldui/flddinf.src | 104 sw/source/ui/fldui/fldpage.cxx | 18 +- sw/source/ui/fldui/fldpage.hxx |6 sw/source/ui/fldui/fldtdlg.hrc | 16 - sw/source/ui/inc/numfmtlb.hxx |2 sw/source/ui/utlui/numfmtlb.cxx| 28 +++ sw/uiconfig/swriter/ui/flddocinfopage.ui | 204 + 20 files changed, 369 insertions(+), 244 deletions(-) New commits: commit 4b42db15708aab7014ec37394ffd51430cdb5f1b Author: Caolán McNamara caol...@redhat.com Date: Sun Aug 18 16:16:53 2013 +0100 convert docinfo field page to .ui Change-Id: Ic968fdf76f31373240ab70d45192f9716375628b diff --git a/extras/source/glade/libreoffice-catalog.xml.in b/extras/source/glade/libreoffice-catalog.xml.in index 64ccea3..1ac15b0 100644 --- a/extras/source/glade/libreoffice-catalog.xml.in +++ b/extras/source/glade/libreoffice-catalog.xml.in @@ -392,6 +392,10 @@ generic-name=PropertyControl parent=VclComboBoxText icon-name=widget-gtk-comboboxtext/ +glade-widget-class title=NumFormatListBox name=swlo-NumFormatListBox +generic-name=NumFormatListBox parent=VclComboBoxText +icon-name=widget-gtk-comboboxtext/ + glade-widget-class title=Reference Button name=foruilo-RefButton generic-name=Reference Button parent=GtkButton icon-name=widget-gtk-button/ diff --git a/include/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx index 42c62d9..1474ad9 100644 --- a/include/sfx2/tabdlg.hxx +++ b/include/sfx2/tabdlg.hxx @@ -194,6 +194,12 @@ public: { return m_pTabCtrl-GetCurPageId(); } + +SfxTabPage* GetCurTabPage() const +{ +return GetTabPage(m_pTabCtrl-GetCurPageId()); +} + OUStringGetPageText( sal_uInt16 nPageId ) const { return m_pTabCtrl-GetPageText(nPageId); diff --git a/sw/AllLangResTarget_sw.mk b/sw/AllLangResTarget_sw.mk index 6317b49..2b096da 100644 --- a/sw/AllLangResTarget_sw.mk +++ b/sw/AllLangResTarget_sw.mk @@ -102,7 +102,6 @@ $(eval $(call gb_SrsTarget_add_files,sw/res,\ sw/source/ui/envelp/labfmt.src \ sw/source/ui/envelp/mailmrge.src \ sw/source/ui/fldui/flddb.src \ -sw/source/ui/fldui/flddinf.src \ sw/source/ui/fldui/flddok.src \ sw/source/ui/fldui/fldfunc.src \ sw/source/ui/fldui/fldref.src \ diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk index 61f22dc..2351a3f 100644 --- a/sw/UIConfig_swriter.mk +++ b/sw/UIConfig_swriter.mk @@ -90,6 +90,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\ sw/uiconfig/swriter/ui/envformatpage \ sw/uiconfig/swriter/ui/envprinterpage \ sw/uiconfig/swriter/ui/exchangedatabases \ + sw/uiconfig/swriter/ui/flddocinfopage \ sw/uiconfig/swriter/ui/formatsectiondialog \ sw/uiconfig/swriter/ui/formattablepage \ sw/uiconfig/swriter/ui/footendnotedialog \ diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h index 01bdcbb..c08e11c 100644 --- a/sw/inc/helpid.h +++ b/sw/inc/helpid.h @@ -145,7 +145,6 @@ #define HID_COND_COLL SW_HID_COND_COLL #define HID_FLD_DB SW_HID_FLD_DB -#define HID_FLD_DOKINF SW_HID_FLD_DOKINF #define HID_FLD_VAR SW_HID_FLD_VAR #define HID_FLD_DOK SW_HID_FLD_DOK #define HID_FLD_FUNC SW_HID_FLD_FUNC @@ -332,7 +331,6 @@ #define HID_COND_COLL_TABLIST SW_HID_COND_COLL_TABLIST #define HID_DB_SELECTION_TLB SW_HID_DB_SELECTION_TLB -#define HID_FIELD_DINF_TYPE SW_HID_FIELD_DINF_TYPE #define HID_SELECT_TEMPLATE SW_HID_SELECT_TEMPLATE diff --git a/sw/source/ui/fldui/flddinf.cxx b/sw/source/ui/fldui/flddinf.cxx index 68cb2a7..a5e7e62 100644 ---
[Libreoffice-commits] core.git: 3 commits - extras/source svtools/source sw/inc sw/source sw/uiconfig sw/UIConfig_swriter.mk vcl/unx
extras/source/glade/libreoffice-catalog.xml.in |3 svtools/source/contnr/simptabl.cxx |2 sw/UIConfig_swriter.mk |1 sw/inc/helpid.h|1 sw/source/ui/envelp/labfmt.cxx | 382 +++ sw/source/ui/envelp/labfmt.hrc | 28 - sw/source/ui/envelp/labfmt.hxx | 57 +-- sw/source/ui/envelp/labfmt.src | 245 -- sw/uiconfig/swriter/ui/labelformatpage.ui | 414 + vcl/unx/kde/UnxFilePicker.cxx |2 vcl/unx/kde4/KDE4FilePicker.cxx|2 11 files changed, 628 insertions(+), 509 deletions(-) New commits: commit 05dab8aef3becce2f17aa72484c5948927997d16 Author: Caolán McNamara caol...@redhat.com Date: Mon Aug 12 11:19:42 2013 +0100 convert label layout tab to .ui Change-Id: Ice1a9b365426059704438da5fee2e4470cfb3f72 diff --git a/extras/source/glade/libreoffice-catalog.xml.in b/extras/source/glade/libreoffice-catalog.xml.in index 267ad83..c692556 100644 --- a/extras/source/glade/libreoffice-catalog.xml.in +++ b/extras/source/glade/libreoffice-catalog.xml.in @@ -314,6 +314,9 @@ glade-widget-class title=NUP Preview name=vcllo-ShowNupOrderWindow generic-name=NUP Preview parent=GtkDrawingArea icon-name=widget-gtk-drawingarea/ +glade-widget-class title=Label Preview name=swuilo-SwLabPreview +generic-name=Label Preview parent=GtkDrawingArea +icon-name=widget-gtk-drawingarea/ glade-widget-class title=Rectangle Control name=svxlo-SvxRectCtl generic-name=Rectangle Control parent=GtkDrawingArea icon-name=widget-gtk-drawingarea/ diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk index f573d71..311364c 100644 --- a/sw/UIConfig_swriter.mk +++ b/sw/UIConfig_swriter.mk @@ -103,6 +103,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\ sw/uiconfig/swriter/ui/insertsectiondialog \ sw/uiconfig/swriter/ui/insertscript \ sw/uiconfig/swriter/ui/inserttable \ + sw/uiconfig/swriter/ui/labelformatpage \ sw/uiconfig/swriter/ui/labeloptionspage \ sw/uiconfig/swriter/ui/linenumbering \ sw/uiconfig/swriter/ui/mailconfigpage \ diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h index d8d4430..3c54ef4 100644 --- a/sw/inc/helpid.h +++ b/sw/inc/helpid.h @@ -145,7 +145,6 @@ #define HID_FRM_STD SW_HID_FRM_STD #define HID_GRF_EXT SW_HID_GRF_EXT #define HID_ENV_PRT SW_HID_ENV_PRT -#define HID_LAB_FMT SW_HID_LAB_FMT #define HID_ENV_ENV SW_HID_ENV_ENV #define HID_ENV_FMT SW_HID_ENV_FMT #define HID_COND_COLL SW_HID_COND_COLL diff --git a/sw/source/ui/envelp/labfmt.cxx b/sw/source/ui/envelp/labfmt.cxx index 947ee59..06b7dd8 100644 --- a/sw/source/ui/envelp/labfmt.cxx +++ b/sw/source/ui/envelp/labfmt.cxx @@ -40,22 +40,19 @@ using namespace ::com::sun::star::beans; #define ROUND(x) ((sal_uInt16) ((x) + .5)) -SwLabPreview::SwLabPreview( const SwLabFmtPage* pParent, const ResId rResID ) : - -Window((Window*) pParent, rResID), - -aGrayColor(COL_LIGHTGRAY), - -aHDistStr (SW_RES(STR_HDIST )), -aVDistStr (SW_RES(STR_VDIST )), -aWidthStr (SW_RES(STR_WIDTH )), -aHeightStr(SW_RES(STR_HEIGHT)), -aLeftStr (SW_RES(STR_LEFT )), -aUpperStr (SW_RES(STR_UPPER )), -aColsStr (SW_RES(STR_COLS )), -aRowsStr (SW_RES(STR_ROWS )), -aPWidthStr (SW_RES(STR_PWIDTH )), -aPHeightStr(SW_RES(STR_PHEIGHT)) +SwLabPreview::SwLabPreview(Window* pParent) +: Window(pParent, 0) +, aGrayColor(COL_LIGHTGRAY) +, aHDistStr(SW_RESSTR(STR_HDIST)) +, aVDistStr(SW_RESSTR(STR_VDIST)) +, aWidthStr(SW_RESSTR(STR_WIDTH)) +, aHeightStr(SW_RESSTR(STR_HEIGHT)) +, aLeftStr(SW_RESSTR(STR_LEFT)) +, aUpperStr(SW_RESSTR(STR_UPPER)) +, aColsStr(SW_RESSTR(STR_COLS)) +, aRowsStr(SW_RESSTR(STR_ROWS)) +, aPWidthStr(SW_RESSTR(STR_PWIDTH)) +, aPHeightStr(SW_RESSTR(STR_PHEIGHT)) { SetMapMode(MAP_PIXEL); @@ -68,12 +65,6 @@ SwLabPreview::SwLabPreview( const SwLabFmtPage* pParent, const ResId rResID ) : aFont.SetWeight (WEIGHT_NORMAL); SetFont(aFont); -const Size aSz(GetOutputSizePixel()); - -lOutWPix = aSz.Width (); -lOutHPix = aSz.Height(); - - lHDistWidth = GetTextWidth(aHDistStr ); lVDistWidth = GetTextWidth(aVDistStr ); lHeightWidth = GetTextWidth(aHeightStr); @@ -84,20 +75,31 @@ SwLabPreview::SwLabPreview( const SwLabFmtPage* pParent, const ResId rResID )
[Libreoffice-commits] core.git: 3 commits - extras/source include/vcl svtools/source vcl/source
extras/source/glade/libreoffice-catalog.xml.in | 89 ++--- include/vcl/builder.hxx|2 include/vcl/field.hxx |4 + svtools/source/control/ctrlbox.cxx | 25 +-- vcl/source/control/combobox.cxx| 27 --- vcl/source/control/field.cxx | 12 +++ vcl/source/window/builder.cxx | 62 +++-- 7 files changed, 159 insertions(+), 62 deletions(-) New commits: commit 30db63e8a3f8806a1b00e14cd70bc75f3e66211e Author: Caolán McNamara caol...@redhat.com Date: Wed Jul 3 11:39:16 2013 +0100 arrange a way to describe non-dropdown MetricBoxes i.e. use a VclComboBoxNumeric which now has an adjustment option and a dropdown option (defaulting to true). Rework existing glade widget placeholders to be children of that widget placeholder. Centralize the dropdown bit tweaking logic. Change-Id: Ib6dc4d19b367986e9d6a2fc2bead51e198892893 diff --git a/extras/source/glade/libreoffice-catalog.xml.in b/extras/source/glade/libreoffice-catalog.xml.in index f717ee0..ad045c5 100644 --- a/extras/source/glade/libreoffice-catalog.xml.in +++ b/extras/source/glade/libreoffice-catalog.xml.in @@ -30,30 +30,92 @@ glade-widget-class title=Hyphen Edit name=cuilo-HyphenEdit generic-name=ReplaceEdit parent=GtkEntry icon-name=widget-gtk-textentry/ + +glade-widget-class title=VclComboBoxText name=VclComboBoxText +generic-name=ComboBoxText parent=GtkComboBoxText +icon-name=widget-gtk-comboboxtext + properties +property save=True query=False id=dropdown default=True name=Use DropDown + parameter-spec +typeGParamBoolean/type + /parameter-spec +/property +property save=True query=False id=max-width-chars default=-1 name=Maximum Width in Characters + parameter-spec +typeGParamInt/type +min-1/min + /parameter-spec + tooltipThe desired maximum width of the ComboBox, in characters/tooltip +/property + /properties +/glade-widget-class + +glade-widget-class title=VclComboBoxNumeric name=VclComboBoxNumeric +generic-name=ComboBoxNumeric parent=VclComboBoxText +icon-name=widget-gtk-comboboxtext + properties +property save=True query=False id=adjustment name=Adjustment + parameter-spec +typeGParamObject/type +value-typeGtkAdjustment/value-type + /parameter-spec + tooltipList of widgets in this group/tooltip +/property + /properties +/glade-widget-class + glade-widget-class title=Color ListBox name=svtlo-ColorListBox generic-name=Color ListBox parent=GtkComboBox -icon-name=widget-gtk-combobox/ +icon-name=widget-gtk-combobox + properties +property id=dropdown default=True common=True/ + /properties +/glade-widget-class + glade-widget-class title=Other Color ListBox name=svxlo-ColorLB generic-name=Other Color ListBox parent=GtkComboBox icon-name=widget-gtk-combobox/ + glade-widget-class title=Font Name ListBox name=svtlo-FontNameBox generic-name=Font name ListBox parent=GtkComboBox -icon-name=widget-gtk-combobox/ +icon-name=widget-gtk-combobox + properties +property id=dropdown default=True common=True/ + /properties +/glade-widget-class + glade-widget-class title=Sidebar Font Name ListBox name=svxlo-SvxSBFontNameBox generic-name=Sidebar Font name ListBox parent=GtkComboBox icon-name=widget-gtk-combobox/ + glade-widget-class title=Font Size ListBox name=svtlo-FontSizeBox generic-name=Font Size ListBox parent=GtkComboBox -icon-name=widget-gtk-combobox/ +icon-name=widget-gtk-combobox + properties +property id=dropdown default=True common=True/ + /properties +/glade-widget-class + glade-widget-class title=Line ListBox name=svtlo-LineListBox generic-name=Line ListBox parent=GtkComboBox -icon-name=widget-gtk-combobox/ +icon-name=widget-gtk-combobox + properties +property id=dropdown default=True common=True/ + /properties +/glade-widget-class + glade-widget-class title=Language ListBox name=svxcorelo-SvxLanguageBox generic-name=LanguageBox parent=GtkComboBox icon-name=widget-gtk-combobox/ + glade-widget-class title=Font ListBox
[Libreoffice-commits] core.git: 3 commits - extras/source starmath/inc starmath/source starmath/uiconfig starmath/UIConfig_smath.mk vcl/source
extras/source/glade/libreoffice-catalog.xml.in |6 starmath/UIConfig_smath.mk |1 starmath/inc/dialog.hxx| 86 +++-- starmath/inc/helpids.h |1 starmath/inc/starmath.hrc |1 starmath/source/dialog.cxx | 395 + starmath/source/smres.src | 83 - starmath/uiconfig/smath/ui/catalogdialog.ui| 207 + vcl/source/control/combobox.cxx|2 vcl/source/control/lstbox.cxx |2 10 files changed, 476 insertions(+), 308 deletions(-) New commits: commit 102c6164cd3003f935f6a041113897d68cb83a27 Author: Caolán McNamara caol...@redhat.com Date: Wed May 22 12:07:21 2013 +0100 adapt code to catalog .ui conversion Change-Id: If34cef7eef5ab26f52420685f54a85fcff2a0c12 diff --git a/extras/source/glade/libreoffice-catalog.xml.in b/extras/source/glade/libreoffice-catalog.xml.in index 91a087d..772ec0b 100644 --- a/extras/source/glade/libreoffice-catalog.xml.in +++ b/extras/source/glade/libreoffice-catalog.xml.in @@ -60,6 +60,12 @@ glade-widget-class title=Font Preview name=svxlo-SvxFontPrevWindow generic-name=Font Preview Window parent=GtkDrawingArea icon-name=widget-gtk-drawingarea/ +glade-widget-class title=Show Math Symbol name=smlo-SmShowSymbol +generic-name=Show Math Symbol parent=GtkDrawingArea +icon-name=widget-gtk-drawingarea/ +glade-widget-class title=Math Symbol Selection name=smlo-SmShowSymbolSet +generic-name=Math Symbol Selection parent=GtkDrawingArea +icon-name=widget-gtk-drawingarea/ glade-widget-class title=Number Preview name=cuilo-SvxNumberPreview generic-name=Number Preview Window parent=GtkDrawingArea icon-name=widget-gtk-drawingarea/ diff --git a/starmath/UIConfig_smath.mk b/starmath/UIConfig_smath.mk index 83a127a..9c42043 100644 --- a/starmath/UIConfig_smath.mk +++ b/starmath/UIConfig_smath.mk @@ -25,6 +25,7 @@ $(eval $(call gb_UIConfig_add_toolbarfiles,modules/smath,\ $(eval $(call gb_UIConfig_add_uifiles,modules/smath,\ starmath/uiconfig/smath/ui/alignmentdialog \ + starmath/uiconfig/smath/ui/catalogdialog \ starmath/uiconfig/smath/ui/printeroptions \ )) diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx index 34511b9..89eec63 100644 --- a/starmath/inc/dialog.hxx +++ b/starmath/inc/dialog.hxx @@ -287,35 +287,56 @@ public: /**/ -class SmShowSymbolSet : public Control +class SmShowSymbolSetWindow : public Control { +ScrollBar* m_pVScrollBar; SymbolPtrVec_t aSymbolSet; -ScrollBar aVScrollBar; -SizeaOutputSize; LinkaSelectHdlLink; LinkaDblClickHdlLink; -sal_uInt16 nLen; -sal_uInt16 nRows, nColumns; -sal_uInt16 nSelectSymbol; +sal_uInt16 nLen; +sal_uInt16 nRows, nColumns; +sal_uInt16 nXOffset, nYOffset; +sal_uInt16 nSelectSymbol; + +void SetScrollBarRange(); +Point OffsetPoint(const Point rPoint) const; virtual voidPaint(const Rectangle); virtual voidMouseButtonDown(const MouseEvent rMEvt); virtual voidKeyInput(const KeyEvent rKEvt); +virtual voidResize(); +virtual SizeGetOptimalSize() const; DECL_LINK( ScrollHdl, ScrollBar* ); - public: -SmShowSymbolSet(Window *pParent, const ResId rResId); - -voidSetSymbolSet(const SymbolPtrVec_t rSymbolSet); - +SmShowSymbolSetWindow(Window *pParent, WinBits nStyle); +void setScrollbar(ScrollBar *pVScrollBar); +void calccols(); 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; } }; +class SmShowSymbolSet : public VclHBox +{ +SmShowSymbolSetWindow aSymbolWindow; +ScrollBar aVScrollBar; +SizeaOutputSize; + +public: +SmShowSymbolSet(Window *pParent); + +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); } +}; + class SmShowSymbol : public Control @@
[Libreoffice-commits] core.git: 3 commits - extras/source sw/uiconfig vcl/source
extras/source/glade/libreoffice-catalog.xml.in |6 ++ sw/uiconfig/swriter/ui/outlinenumberingpage.ui |2 +- sw/uiconfig/swriter/ui/outlinepositionpage.ui |2 +- vcl/source/control/morebtn.cxx |1 + 4 files changed, 9 insertions(+), 2 deletions(-) New commits: commit 7d6f4391deb85012c4ede0bb5f35b1d6f347bc0f Author: Caolán McNamara caol...@redhat.com Date: Wed May 1 16:44:00 2013 +0100 Resoves: fdo#31849 ensure more button text remains vertically centered Is seems very bizarre that in Button::ImplDrawAlignedImage if there is no image, that we still add padding for the image separator to the text position. Why we have the concept of an Image *and* a Symbol escapes me. Anyway, setting the Image align to the right to match the Symbol align stops the button text getting displaced downwards. Change-Id: I67b80b2ff5cc960f5394cb7d69cab7a4c14513bf diff --git a/vcl/source/control/morebtn.cxx b/vcl/source/control/morebtn.cxx index 0debd4c..5d61292 100644 --- a/vcl/source/control/morebtn.cxx +++ b/vcl/source/control/morebtn.cxx @@ -50,6 +50,7 @@ void MoreButton::ImplInit( Window* pParent, WinBits nStyle ) ShowState(); SetSymbolAlign(SYMBOLALIGN_RIGHT); +SetImageAlign(IMAGEALIGN_RIGHT); //Resoves: fdo#31849 ensure button remains vertically centered SetSmallSymbol(true); if ( ! ( nStyle ( WB_RIGHT | WB_LEFT ) ) ) commit 1bdf1122a9860a460ba6275d747d8baeedcfe1d1 Author: Caolán McNamara caol...@redhat.com Date: Wed May 1 15:19:03 2013 +0100 put a border around the numbering level listbox Change-Id: Ie45cc82af0e232b7b523d30552cc14317fc479b5 diff --git a/sw/uiconfig/swriter/ui/outlinenumberingpage.ui b/sw/uiconfig/swriter/ui/outlinenumberingpage.ui index d16f8f7..9447f27 100644 --- a/sw/uiconfig/swriter/ui/outlinenumberingpage.ui +++ b/sw/uiconfig/swriter/ui/outlinenumberingpage.ui @@ -32,7 +32,7 @@ property name=top_padding6/property property name=left_padding12/property child - object class=GtkTreeView id=level + object class=GtkTreeView id=level:border property name=visibleTrue/property property name=can_focusTrue/property property name=headers_visibleFalse/property diff --git a/sw/uiconfig/swriter/ui/outlinepositionpage.ui b/sw/uiconfig/swriter/ui/outlinepositionpage.ui index de97b4b..74e4388 100644 --- a/sw/uiconfig/swriter/ui/outlinepositionpage.ui +++ b/sw/uiconfig/swriter/ui/outlinepositionpage.ui @@ -33,7 +33,7 @@ property name=top_padding6/property property name=left_padding12/property child - object class=GtkTreeView id=levellb + object class=GtkTreeView id=levellb:border property name=visibleTrue/property property name=can_focusTrue/property property name=headers_visibleFalse/property commit b0461fbde8476c879183d9a6600a3d3567888f64 Author: Caolán McNamara caol...@redhat.com Date: Wed May 1 15:18:49 2013 +0100 stubs for more custom widgets Change-Id: I27d96030aed3866c0d384a28598e292cb4ab3a04 diff --git a/extras/source/glade/libreoffice-catalog.xml.in b/extras/source/glade/libreoffice-catalog.xml.in index ca81047..d6980be 100644 --- a/extras/source/glade/libreoffice-catalog.xml.in +++ b/extras/source/glade/libreoffice-catalog.xml.in @@ -63,6 +63,9 @@ glade-widget-class title=Number Preview name=cuilo-SvxNumberPreview generic-name=Number Preview Window parent=GtkDrawingArea icon-name=widget-gtk-drawingarea/ +glade-widget-class title=Writer Number Preview name=swuilo-NumberingPreview +generic-name=Writer Number Preview Window parent=GtkDrawingArea +icon-name=widget-gtk-drawingarea/ glade-widget-class title=Background Preview name=cuilo-BackgroundPreview generic-name=Background Preview Window parent=GtkDrawingArea icon-name=widget-gtk-drawingarea/ @@ -120,6 +123,9 @@ glade-widget-class title=Text Direction ListBox name=svxlo-FrameDirectionListBox generic-name=FrameDirectionListBox parent=GtkComboBox icon-name=widget-gtk-combobox/ +glade-widget-class title=Numbering Type ListBox name=swlo-SwNumberingTypeListBox +generic-name=NumberingTypeListBox parent=GtkComboBox +icon-name=widget-gtk-combobox/ glade-widget-class title=Gradiant ListBox name=svxlo-GradientLB generic-name=GradiantListBox parent=GtkComboBox icon-name=widget-gtk-combobox/ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org
[Libreoffice-commits] core.git: 3 commits - extras/source sc/AllLangResTarget_sc.mk sc/source sc/uiconfig sc/UIConfig_scalc.mk sd/uiconfig svtools/source svx/source
extras/source/glade/libreoffice-catalog.xml.in |3 sc/AllLangResTarget_sc.mk |1 sc/UIConfig_scalc.mk |1 sc/source/ui/inc/protectiondlg.hrc | 38 --- sc/source/ui/inc/protectiondlg.hxx | 23 -- sc/source/ui/miscdlgs/protectiondlg.cxx| 89 +++- sc/source/ui/miscdlgs/protectiondlg.src| 125 --- sc/uiconfig/scalc/ui/protectsheetdlg.ui| 108 ++ sd/uiconfig/sdraw/ui/modifylayer.ui| 270 - svtools/source/contnr/treelistbox.cxx |6 svx/source/dialog/checklbx.cxx | 13 + 11 files changed, 135 insertions(+), 542 deletions(-) New commits: commit adfacdd91cb67ed7f2ae0d4991537211d263278d Author: Caolán McNamara caol...@redhat.com Date: Wed Apr 24 16:57:16 2013 +0100 adapt code to protect sheet .ui Change-Id: Ic3c375e87cf89a3956f3703c6facbcbe5ffd5d58 diff --git a/extras/source/glade/libreoffice-catalog.xml.in b/extras/source/glade/libreoffice-catalog.xml.in index 4774077..9275f78 100644 --- a/extras/source/glade/libreoffice-catalog.xml.in +++ b/extras/source/glade/libreoffice-catalog.xml.in @@ -132,6 +132,9 @@ glade-widget-class title=Tab List name=svtlo-SvTabListBox generic-name=Tab List parent=svtlo-SvTreeListBox icon-name=widget-gtk-treeview/ +glade-widget-class title=Checked Tree List name=svxlo-SvxCheckListBox +generic-name=Checked Tree List parent=GtkTreeView +icon-name=widget-gtk-treeview/ glade-widget-class title=Dial Control name=svxlo-DialControl generic-name=Dial Control parent=GtkSpinner icon-name=widget-gtk-spinner/ diff --git a/sc/AllLangResTarget_sc.mk b/sc/AllLangResTarget_sc.mk index c25cc42..2a3adcc 100644 --- a/sc/AllLangResTarget_sc.mk +++ b/sc/AllLangResTarget_sc.mk @@ -82,7 +82,6 @@ $(eval $(call gb_SrsTarget_add_files,sc/res,\ sc/source/ui/miscdlgs/retypepassdlg.src \ sc/source/ui/miscdlgs/highred.src \ sc/source/ui/miscdlgs/conflictsdlg.src \ -sc/source/ui/miscdlgs/protectiondlg.src \ sc/source/ui/miscdlgs/acredlin.src \ sc/source/ui/formdlg/formdlgs.src \ sc/source/ui/formdlg/dwfunctr.src \ diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk index 89ad302..48a8da0 100644 --- a/sc/UIConfig_scalc.mk +++ b/sc/UIConfig_scalc.mk @@ -72,6 +72,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\ sc/uiconfig/scalc/ui/insertsheet \ sc/uiconfig/scalc/ui/managenamesdialog \ sc/uiconfig/scalc/ui/printeroptions \ + sc/uiconfig/scalc/ui/protectsheetdlg \ sc/uiconfig/scalc/ui/sheetprintpage \ sc/uiconfig/scalc/ui/selectrange \ sc/uiconfig/scalc/ui/selectsource \ diff --git a/sc/source/ui/inc/protectiondlg.hrc b/sc/source/ui/inc/protectiondlg.hrc deleted file mode 100644 index 5c806de..000 --- a/sc/source/ui/inc/protectiondlg.hrc +++ /dev/null @@ -1,38 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the License); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include sc.hrc - -#define BTN_OK 1 -#define BTN_CANCEL 2 -#define BTN_HELP3 - -#define BTN_PROTECT 4 -#define FT_PASSWORD15 -#define ED_PASSWORD16 -#define FT_PASSWORD27 -#define ED_PASSWORD28 -#define FL_OPTIONS 9 -#define FT_OPTIONS 10 -#define CLB_OPTIONS11 - -#define ST_SELECT_PROTECTED_CELLS 50 -#define ST_SELECT_UNPROTECTED_CELLS51 - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/protectiondlg.hxx b/sc/source/ui/inc/protectiondlg.hxx index 2eb6abd..ad1afb9 100644 --- a/sc/source/ui/inc/protectiondlg.hxx +++ b/sc/source/ui/inc/protectiondlg.hxx @@ -24,6 +24,7 @@ #include vcl/button.hxx #include vcl/fixed.hxx #include vcl/edit.hxx +#include vcl/layout.hxx #include svx/checklbx.hxx class Window; @@ -48,23 +49,19 @@ private: void EnableOptionalWidgets(bool
[Libreoffice-commits] core.git: 3 commits - extras/source filter/source sc/AllLangResTarget_sc.mk sc/inc sc/source sc/uiconfig sc/UIConfig_scalc.mk svtools/inc svtools/source
extras/source/glade/libreoffice-catalog.xml.in |4 filter/source/msfilter/svdfppt.cxx | 10 ++ sc/AllLangResTarget_sc.mk |1 sc/UIConfig_scalc.mk |1 sc/inc/helpids.h |2 sc/inc/sc.hrc |2 sc/inc/scabstdlg.hxx |2 sc/source/ui/attrdlg/scdlgfact.cxx | 21 sc/source/ui/attrdlg/scdlgfact.hxx |3 sc/source/ui/docshell/arealink.cxx |2 sc/source/ui/inc/linkarea.hrc | 35 --- sc/source/ui/inc/linkarea.hxx | 19 +-- sc/source/ui/miscdlgs/linkarea.cxx | 93 --- sc/source/ui/miscdlgs/linkarea.src | 119 - sc/source/ui/view/cellsh1.cxx |3 sc/uiconfig/scalc/ui/externaldata.ui | 79 ++-- svtools/inc/svtools/inettbc.hxx|9 - svtools/source/control/inettbc.cxx | 30 -- 18 files changed, 148 insertions(+), 287 deletions(-) New commits: commit 4f4ab917261e0f3fef242e54a2a5e45fb75aeb82 Author: Caolán McNamara caol...@redhat.com Date: Mon Apr 15 10:36:15 2013 +0100 convert external data dialog to .ui Change-Id: I2dfaf152bd473f73fdeec08a8c2ac6b007d38352 diff --git a/sc/AllLangResTarget_sc.mk b/sc/AllLangResTarget_sc.mk index 4867639..eac9600 100644 --- a/sc/AllLangResTarget_sc.mk +++ b/sc/AllLangResTarget_sc.mk @@ -106,7 +106,6 @@ $(eval $(call gb_SrsTarget_add_files,sc/res,\ sc/source/ui/miscdlgs/protectiondlg.src \ sc/source/ui/miscdlgs/acredlin.src \ sc/source/ui/miscdlgs/sharedocdlg.src \ -sc/source/ui/miscdlgs/linkarea.src \ sc/source/ui/formdlg/formdlgs.src \ sc/source/ui/formdlg/dwfunctr.src \ sc/source/core/src/compiler.src \ diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk index 8f800bf..4371959 100644 --- a/sc/UIConfig_scalc.mk +++ b/sc/UIConfig_scalc.mk @@ -63,6 +63,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\ sc/uiconfig/scalc/ui/definename \ sc/uiconfig/scalc/ui/deletecells \ sc/uiconfig/scalc/ui/deletecontents \ + sc/uiconfig/scalc/ui/externaldata \ sc/uiconfig/scalc/ui/formatcellsdialog \ sc/uiconfig/scalc/ui/insertname \ sc/uiconfig/scalc/ui/insertsheet \ diff --git a/sc/inc/helpids.h b/sc/inc/helpids.h index 6f210c8..fa4323c 100644 --- a/sc/inc/helpids.h +++ b/sc/inc/helpids.h @@ -196,8 +196,6 @@ #define HID_DATAPILOT_SERVICE SC_HID_DATAPILOT_SERVICE // Other help IDs (max.70) --- -#define HID_SCDLG_LINKAREAURL SC_HID_SCDLG_LINKAREAURL - #define HID_SELECTTABLES SC_HID_SELECTTABLES #define HID_SC_REPLCELLSWARN SC_HID_SC_REPLCELLSWARN diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc index 4749970..d131092 100644 --- a/sc/inc/sc.hrc +++ b/sc/inc/sc.hrc @@ -1064,7 +1064,7 @@ #define RID_SCDLG_DAPISERVICE (SC_DIALOGS_START + 130) #define RID_SCDLG_DAPIDATA (SC_DIALOGS_START + 131) -#define RID_SCDLG_LINKAREA (SC_DIALOGS_START + 132) + #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) diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx index 89997d4..026a03e 100644 --- a/sc/inc/scabstdlg.hxx +++ b/sc/inc/scabstdlg.hxx @@ -396,7 +396,7 @@ public: virtual AbstractScSelEntryDlg * CreateScSelEntryDlg ( Window* pParent, // add for ScSelEntryDlg const std::vectorString rEntryList ) = 0; -virtual AbstractScLinkedAreaDlg * CreateScLinkedAreaDlg ( Window* pParent, int nId) = 0; //add for ScLinkedAreaDlg +virtual AbstractScLinkedAreaDlg * CreateScLinkedAreaDlg(Window* pParent) = 0; //add for ScLinkedAreaDlg virtual AbstractScMetricInputDlg * CreateScMetricInputDlg ( Window* pParent, //add for ScMetricInputDlg sal_uInt16 nResId, // derivative for every dialog! diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx b/sc/source/ui/attrdlg/scdlgfact.cxx index 98b656f..83f3c23 100644 --- a/sc/source/ui/attrdlg/scdlgfact.cxx +++ b/sc/source/ui/attrdlg/scdlgfact.cxx @@ -982,27 +982,12 @@ AbstractScSelEntryDlg * ScAbstractDialogFactory_Impl::CreateScSelEntryDlg ( Wind } // add for ScSelEntryDlg end - -AbstractScLinkedAreaDlg * ScAbstractDialogFactory_Impl::CreateScLinkedAreaDlg ( Window* pParent, -int nId) +AbstractScLinkedAreaDlg *
[Libreoffice-commits] core.git: 3 commits - extras/source svx/AllLangResTarget_svx.mk svx/inc svx/source svx/uiconfig svx/UI_svx.mk sw/source
extras/source/glade/libreoffice-catalog.xml |3 svx/AllLangResTarget_svx.mk |1 svx/UI_svx.mk|1 svx/inc/helpid.hrc |9 - svx/inc/svx/ctredlin.hxx | 30 +--- svx/inc/svx/svxids.hrc |1 svx/source/dialog/ctredlin.cxx | 169 -- svx/source/dialog/ctredlin.hrc | 22 -- svx/source/dialog/ctredlin.src | 99 - svx/uiconfig/ui/redlinecontrol.ui| 173 --- svx/uiconfig/ui/redlineviewpage.ui | 202 +++ sw/source/filter/ww8/docxattributeoutput.cxx | 12 - 12 files changed, 283 insertions(+), 439 deletions(-) New commits: commit 38302b308559b8e34916a07ea3a160085c596c2e Author: Caolán McNamara caol...@redhat.com Date: Thu Feb 21 15:54:57 2013 + split up redline dialog and adapt redline view code Change-Id: Ib185eacbd0b4123ec947d116076358794bf42d46 diff --git a/svx/AllLangResTarget_svx.mk b/svx/AllLangResTarget_svx.mk index c4f66e6..4e139e1 100644 --- a/svx/AllLangResTarget_svx.mk +++ b/svx/AllLangResTarget_svx.mk @@ -50,7 +50,6 @@ $(eval $(call gb_SrsTarget_add_files,svx/res,\ svx/source/core/graphichelper.src \ svx/source/dialog/bmpmask.src \ svx/source/dialog/contdlg.src \ -svx/source/dialog/ctredlin.src \ svx/source/dialog/dlgctrl.src \ svx/source/dialog/docrecovery.src \ svx/source/dialog/fontwork.src \ diff --git a/svx/UI_svx.mk b/svx/UI_svx.mk index df3d0b4..38945e8 100644 --- a/svx/UI_svx.mk +++ b/svx/UI_svx.mk @@ -14,6 +14,7 @@ $(eval $(call gb_UI_add_uifiles,svx,\ svx/uiconfig/ui/chineseconversiondialog \ svx/uiconfig/ui/compressgraphicdialog \ svx/uiconfig/ui/redlinefilterpage \ + svx/uiconfig/ui/redlineviewpage \ )) # vim: set noet sw=4 ts=4: diff --git a/svx/inc/helpid.hrc b/svx/inc/helpid.hrc index afd9484..dab6dc8 100644 --- a/svx/inc/helpid.hrc +++ b/svx/inc/helpid.hrc @@ -154,15 +154,6 @@ #define HID_POPUP_LINEEND SVX_HID_POPUP_LINEEND #define HID_POPUP_LINEEND_CTRL SVX_HID_POPUP_LINEEND_CTRL #define HID_REDLINING_TABCONTROL SVX_HID_REDLINING_TABCONTROL -#define HID_REDLINING_VIEW_DG_VIEW SVX_HID_REDLINING_VIEW_DG_VIEW -#define HID_REDLINING_VIEW_DG_VIEW_HEADER SVX_HID_REDLINING_VIEW_DG_VIEW_HEADER -#define HID_REDLINING_VIEW_DG_VIEW_TABLE SVX_HID_REDLINING_VIEW_DG_VIEW_TABLE -#define HID_REDLINING_VIEW_PAGE SVX_HID_REDLINING_VIEW_PAGE -#define HID_REDLINING_VIEW_PB_ACCEPT SVX_HID_REDLINING_VIEW_PB_ACCEPT -#define HID_REDLINING_VIEW_PB_ACCEPTALL SVX_HID_REDLINING_VIEW_PB_ACCEPTALL -#define HID_REDLINING_VIEW_PB_REJECT SVX_HID_REDLINING_VIEW_PB_REJECT -#define HID_REDLINING_VIEW_PB_REJECTALL SVX_HID_REDLINING_VIEW_PB_REJECTALL -#define HID_REDLINING_VIEW_PB_UNDO SVX_HID_REDLINING_VIEW_PB_UNDO #define HID_STYLE_LISTBOX SVX_HID_STYLE_LISTBOX #define HID_SVXTBX_UNDO_REDO_CTRL SVX_HID_SVXTBX_UNDO_REDO_CTRL #define HID_SVX_CHINESE_DICTIONARY_CB_REVERSE SVX_HID_SVX_CHINESE_DICTIONARY_CB_REVERSE diff --git a/svx/inc/svx/ctredlin.hxx b/svx/inc/svx/ctredlin.hxx index 2ce91fc..d6d5f7b 100644 --- a/svx/inc/svx/ctredlin.hxx +++ b/svx/inc/svx/ctredlin.hxx @@ -304,30 +304,18 @@ private: LinkRejectAllClickLk; LinkUndoClickLk; -SvxSimpleTableContainer m_aViewDataContainer; -SvxRedlinTable aViewData; -PushButton PbAccept; -PushButton PbReject; -PushButton PbAcceptAll; -PushButton PbRejectAll; -PushButton PbUndo; -String aTitle1; -String aTitle2; -String aTitle3; -String aTitle4; -String aTitle5; -longnDistance; -SizeaMinSize; +SvxRedlinTable* m_pViewData; +PushButton* m_pAccept; +PushButton* m_pReject; +PushButton* m_pAcceptAll; +PushButton* m_pRejectAll; +PushButton* m_pUndo; DECL_LINK( PbClickHdl, PushButton* ); - -protected: - -voidResize(); - public: -SvxTPView( Window * pParent); +SvxTPView(Window * pParent); +~SvxTPView(); voidInsertWriterHeader(); voidInsertCalcHeader(); @@ -349,8 +337,6 @@ public: voidHideUndo() {ShowUndo(sal_False);} sal_BoolIsUndoVisible(); -SizeGetMinSizePixel(); - voidSetAcceptClickHdl( const Link rLink ) {