[Libreoffice-commits] core.git: readlicense_oo/license scp2/source setup_native/source
readlicense_oo/license/license.xml |5 + scp2/source/ooo/file_ooo.scp|9 + scp2/source/ooo/module_ooo.scp | 11 +++ scp2/source/ooo/module_ooo.ulf |6 ++ setup_native/source/packinfo/packinfo_office.txt| 15 +++ setup_native/source/packinfo/spellchecker_selection.txt |1 + 6 files changed, 47 insertions(+) New commits: commit 20ceadb1cf73c27011a32a243726ac11f3839ace Author: Andras Timar AuthorDate: Sun Apr 11 10:00:41 2021 +0200 Commit: Andras Timar CommitDate: Sun Apr 11 10:51:16 2021 +0200 Add Esperanto dictionaries Change-Id: I22d73bb5a6e4d215dc35acdd4ded47d29882671e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113941 Tested-by: Jenkins Reviewed-by: Andras Timar diff --git a/readlicense_oo/license/license.xml b/readlicense_oo/license/license.xml index 290cdfdfee94..0655cc8bee62 100644 --- a/readlicense_oo/license/license.xml +++ b/readlicense_oo/license/license.xml @@ -3302,6 +3302,11 @@ Jump to GPL Version 3 Jump to LGPL Version 3 Jump to MPL Version 1.1 +Esperanto +Spelling dictionary, hyphenation patterns, and thesaurus +The following software may be included in this product: Esperanto spelling dictionary, hyphenation patterns, +and thesaurus. Use of any of this software is governed by the terms of the license below: +GNU General Public License version 3. Estonian Spelling dictionary The following software may be included in this product: Estonian spelling dictionary. Use of any of this diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index 7d2a1eed2f0e..dc1697395b14 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -401,6 +401,15 @@ File gid_File_Extension_Dictionary_El End #endif +#if defined WITH_MYSPELL_DICTS +File gid_File_Extension_Dictionary_Eo + Dir = FILELIST_DIR; + Name = "Dictionary/dict-eo.filelist"; + Styles = (PACKED, FORCELANGUAGEPACK, FILELIST); + TXT_FILE_BODY; +End +#endif + #if defined WITH_MYSPELL_DICTS File gid_File_Extension_Dictionary_Es Dir = FILELIST_DIR; diff --git a/scp2/source/ooo/module_ooo.scp b/scp2/source/ooo/module_ooo.scp index ee8024fe8f21..5bfc0137a38a 100644 --- a/scp2/source/ooo/module_ooo.scp +++ b/scp2/source/ooo/module_ooo.scp @@ -291,6 +291,17 @@ Module gid_Module_Root_Extension_Dictionary_El Styles = (); End +Module gid_Module_Root_Extension_Dictionary_Eo +MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_EO ); +Files = (gid_File_Extension_Dictionary_Eo); +InstallOrder = "2000"; +Sortkey = "721"; +Spellcheckerlanguage = "eo"; +PackageInfo = "packinfo_office.txt"; +ParentID = gid_Module_Dictionaries; +Styles = (); +End + Module gid_Module_Root_Extension_Dictionary_Es MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_ES ); Files = (gid_File_Extension_Dictionary_Es); diff --git a/scp2/source/ooo/module_ooo.ulf b/scp2/source/ooo/module_ooo.ulf index 5aaa1dc05ccd..9c65148431ae 100644 --- a/scp2/source/ooo/module_ooo.ulf +++ b/scp2/source/ooo/module_ooo.ulf @@ -130,6 +130,12 @@ en-US = "Greek" [STR_DESC_MODULE_EXTENSION_DICTIONARY_EL] en-US = "Greek spelling dictionary, and hyphenation rules" +[STR_NAME_MODULE_EXTENSION_DICTIONARY_EO] +en-US = "Esperanto" + +[STR_DESC_MODULE_EXTENSION_DICTIONARY_EO] +en-US = "Esperanto spelling dictionary, hyphenation rules, and thesaurus" + [STR_NAME_MODULE_EXTENSION_DICTIONARY_ES] en-US = "Spanish" diff --git a/setup_native/source/packinfo/packinfo_office.txt b/setup_native/source/packinfo/packinfo_office.txt index 56866e7d6a3d..2384cdfc1cdf 100644 --- a/setup_native/source/packinfo/packinfo_office.txt +++ b/setup_native/source/packinfo/packinfo_office.txt @@ -582,6 +582,21 @@ destpath = "/opt" packageversion = "%PACKAGEVERSION" End +Start +module = "gid_Module_Root_Extension_Dictionary_Eo" +solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-eo" +solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION" +packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-eo" +requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME%BRANDPACKAGEVERSION %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" +linuxpatchrequires = "" +copyright = "2021 The Document Foundation" +solariscopyright = "solariscopyrightfile" +vendor = "The Document Foundation" +description = "Eo dictionary for %PRODUCTNAME %PRODUCTVERSION" +destpath = "/opt" +packageversion = "%PACKAGEVERSION" +End + Start module = "
[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - icon-themes/sukapura icon-themes/sukapura_svg
icon-themes/sukapura/svx/res/markers.png |binary icon-themes/sukapura_svg/svx/res/markers.svg |2 +- 2 files changed, 1 insertion(+), 1 deletion(-) New commits: commit 80687c35319ffd0c00836801f953acc388a458c4 Author: Rizal Muttaqin AuthorDate: Sun Apr 11 12:37:15 2021 +0700 Commit: Rizal Muttaqin CommitDate: Sun Apr 11 11:48:15 2021 +0200 Sukapura: tdf#141618 fix blured vertical line of Sukapura's anchor marker Change-Id: I11b3fca85ec00049dfe84df6cfb548a320e255cc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113937 Tested-by: Jenkins Reviewed-by: Rizal Muttaqin (cherry picked from commit d9f10d8f0f6bae31dd5ebd9fa00f989d17fc21da) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113866 diff --git a/icon-themes/sukapura/svx/res/markers.png b/icon-themes/sukapura/svx/res/markers.png index 38c2f92c6047..0ce89a9f3275 100644 Binary files a/icon-themes/sukapura/svx/res/markers.png and b/icon-themes/sukapura/svx/res/markers.png differ diff --git a/icon-themes/sukapura_svg/svx/res/markers.svg b/icon-themes/sukapura_svg/svx/res/markers.svg index d6bedcbca334..ba34c35ad91d 100644 --- a/icon-themes/sukapura_svg/svx/res/markers.svg +++ b/icon-themes/sukapura_svg/svx/res/markers.svg @@ -1 +1 @@ -http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink";>< linearGradient id="ad" gradientUnits="userSpaceOnUse" x1="38.5" x2="38.5" xlink:href="#t" y1="30" y2="23"/>< path d="m53 16.50002a4.5 4.5 0 0 1 -4.5 4.5 4.5 4.5 0 0 1 -4.5-4.5 4.5 4.5 0 0 1 4.5-4.5 4.5 4.5 0 0 1 4.5 4.5z" fill="url(#at)"/> \ No newline at end of file +http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink";>< linearGradient id="ad" gradientUnits="userSpaceOnUse" x1="38.5" x2="38.5" xlink:href="#t" y1="30" y2="23"/> \ 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: hwpfilter/source
hwpfilter/source/hwpread.cxx | 12
1 file changed, 4 insertions(+), 8 deletions(-)
New commits:
commit ed901cc95b24d01c741861526d66f9451827c0ba
Author: Caolán McNamara
AuthorDate: Sat Apr 10 20:35:50 2021 +0100
Commit: Caolán McNamara
CommitDate: Sun Apr 11 12:06:51 2021 +0200
Related: ofz#31685 Timeout. This hunk is a simple swap
Change-Id: Ia4c0f2727c0278496c68f54eca3046a924fa21e9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113930
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/hwpfilter/source/hwpread.cxx b/hwpfilter/source/hwpread.cxx
index 36fb77996c56..ca2a2eff534e 100644
--- a/hwpfilter/source/hwpread.cxx
+++ b/hwpfilter/source/hwpread.cxx
@@ -285,7 +285,7 @@ bool TxtBox::Read(HWPFile & hwpf)
ncell = nCell;
if (ncell <= 0){
return hwpf.SetState(HWP_InvalidFileFormat);
- }
+}
cell.reset( ::comphelper::newArray_null(ncell) );
if (!cell) {
@@ -333,22 +333,18 @@ bool TxtBox::Read(HWPFile & hwpf)
tcell->pCell = &cell[ii];
pArr[ii] = tcell;
}
-TCell *tmp;
+
// Sort by row and column
for( ii = 0 ; ii < ncell - 1; ii++ ){
for( int jj = ii ; jj < ncell ; jj++){
if( pArr[ii]->nRowIndex > pArr[jj]->nRowIndex ){
-tmp = pArr[ii];
-pArr[ii] = pArr[jj];
-pArr[jj] = tmp;
+std::swap(pArr[ii], pArr[jj]);
}
}
for( int kk = ii ; kk > 0 ; kk--){
if( ( pArr[kk]->nRowIndex == pArr[kk-1]->nRowIndex ) &&
(pArr[kk]->nColumnIndex < pArr[kk-1]->nColumnIndex )){
-tmp = pArr[kk];
-pArr[kk] = pArr[kk-1];
-pArr[kk-1] = tmp;
+std::swap(pArr[kk], pArr[kk-1]);
}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: hwpfilter/source
hwpfilter/source/hwpread.cxx |7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
New commits:
commit 998ee89bcaf42697b5541008787ce05ecbe608d4
Author: Caolán McNamara
AuthorDate: Sat Apr 10 20:49:45 2021 +0100
Commit: Caolán McNamara
CommitDate: Sun Apr 11 12:07:10 2021 +0200
ofz#31685 give up on large tables to avoid Timeout
Change-Id: I99a7cdede74c4e8a661579467624f21fcf9132df
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113931
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/hwpfilter/source/hwpread.cxx b/hwpfilter/source/hwpread.cxx
index ca2a2eff534e..b3eb5504a0d6 100644
--- a/hwpfilter/source/hwpread.cxx
+++ b/hwpfilter/source/hwpread.cxx
@@ -283,7 +283,12 @@ bool TxtBox::Read(HWPFile & hwpf)
UpdateBBox(this);
ncell = nCell;
-if (ncell <= 0){
+if (ncell <= 0) {
+return hwpf.SetState(HWP_InvalidFileFormat);
+}
+
+if (ncell > 4096 && utl::ConfigManager::IsFuzzing()) {
+// cut off at an arbitary size to speed up fuzzing
return hwpf.SetState(HWP_InvalidFileFormat);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - vcl/source
vcl/source/bitmap/BitmapSmoothenFilter.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 8a75c591ef0cb017c58a7f068d1ae6571f87bd90 Author: Julien Nabet AuthorDate: Sat Apr 10 19:30:23 2021 +0200 Commit: Caolán McNamara CommitDate: Sun Apr 11 12:13:41 2021 +0200 Related tdf#117750: fix UnsharpenFilter Change-Id: I372bb6baae747adb3b2d2a2b8fd39d1631b074ec Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113927 (cherry picked from commit 3d32e6a6ccfae56f379cb1dec6dcadf9aa8fa85f) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113859 Tested-by: Jenkins Reviewed-by: Caolán McNamara diff --git a/vcl/source/bitmap/BitmapSmoothenFilter.cxx b/vcl/source/bitmap/BitmapSmoothenFilter.cxx index 67cea0cb3dfa..e9c135f8ec59 100644 --- a/vcl/source/bitmap/BitmapSmoothenFilter.cxx +++ b/vcl/source/bitmap/BitmapSmoothenFilter.cxx @@ -24,7 +24,7 @@ BitmapEx BitmapSmoothenFilter::execute(BitmapEx const& rBitmapEx) const bRet = BitmapFilter::Filter(aBitmapEx, BitmapSeparableUnsharpenFilter(mfRadius)); if (bRet) -return rBitmapEx; +return aBitmapEx; return BitmapEx(); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - vcl/source
vcl/source/bitmap/BitmapSepiaFilter.cxx|2 +- vcl/source/bitmap/BitmapSolarizeFilter.cxx |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit d41693f2eb48fce3d808f1719bbd60f2d2041203 Author: Julien Nabet AuthorDate: Sat Apr 10 19:09:41 2021 +0200 Commit: Caolán McNamara CommitDate: Sun Apr 11 12:14:15 2021 +0200 Related tdf#117750: fix "Solarization" and "Aging" For solarization, regression from: https://cgit.freedesktop.org/libreoffice/core/commit/?id=c38485279cd36da96ac81107d567ea4e779b2b96 author Chris Sherlock 2018-04-20 20:27:41 +1000 committer Tomaž Vajngerl2018-04-22 05:33:11 +0200 commit c38485279cd36da96ac81107d567ea4e779b2b96 (patch) treead9843a17f87271f9e0cf89643e2e6c3ee8a8de1 parent bcbf767bcfc024e2be839e0c0886f942dd068e4f (diff) vcl: ImplSolarize() to BitmapSolarizeFilter For aging, regression from: https://cgit.freedesktop.org/libreoffice/core/commit/?id=1ab12471f3a69c4d502e6271e84ddf8a981f507f author Chris Sherlock 2018-04-20 20:32:23 +1000 committer Tomaž Vajngerl2018-04-22 05:33:39 +0200 commit 1ab12471f3a69c4d502e6271e84ddf8a981f507f (patch) tree6652276229ad1c3ffca48f7a31e1b77d2ea04b07 parent c38485279cd36da96ac81107d567ea4e779b2b96 (diff) vcl: ImplSepia -> BitmapSepiaFilter Change-Id: I4f350aa8b494caf55c9c810ac7fa9ed8db349725 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113926 (cherry picked from commit f3151e62bcc7cb66313df70a2ec8eed8ca8f2c88) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113858 Tested-by: Jenkins Reviewed-by: Caolán McNamara diff --git a/vcl/source/bitmap/BitmapSepiaFilter.cxx b/vcl/source/bitmap/BitmapSepiaFilter.cxx index cfac984b8fa3..9c1ff76672d3 100644 --- a/vcl/source/bitmap/BitmapSepiaFilter.cxx +++ b/vcl/source/bitmap/BitmapSepiaFilter.cxx @@ -103,7 +103,7 @@ BitmapEx BitmapSepiaFilter::execute(BitmapEx const& rBitmapEx) const } if (bRet) -return rBitmapEx; +return BitmapEx(aBitmap); return BitmapEx(); } diff --git a/vcl/source/bitmap/BitmapSolarizeFilter.cxx b/vcl/source/bitmap/BitmapSolarizeFilter.cxx index c4df366a65cb..0fc4ab6136cc 100644 --- a/vcl/source/bitmap/BitmapSolarizeFilter.cxx +++ b/vcl/source/bitmap/BitmapSolarizeFilter.cxx @@ -63,7 +63,7 @@ BitmapEx BitmapSolarizeFilter::execute(BitmapEx const& rBitmapEx) const } if (bRet) -return rBitmapEx; +return BitmapEx(aBitmap); return BitmapEx(); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - icon-themes/sukapura icon-themes/sukapura_svg
icon-themes/sukapura/svx/res/markers.png |binary icon-themes/sukapura_svg/svx/res/markers.svg |2 +- 2 files changed, 1 insertion(+), 1 deletion(-) New commits: commit 7b46ac4599acd36ce7685654b06d47d8b0536f64 Author: Rizal Muttaqin AuthorDate: Sun Apr 11 12:37:15 2021 +0700 Commit: Caolán McNamara CommitDate: Sun Apr 11 12:14:41 2021 +0200 Sukapura: tdf#141618 fix blured vertical line of Sukapura's anchor marker Change-Id: I11b3fca85ec00049dfe84df6cfb548a320e255cc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113937 Tested-by: Jenkins Reviewed-by: Rizal Muttaqin (cherry picked from commit d9f10d8f0f6bae31dd5ebd9fa00f989d17fc21da) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113865 Reviewed-by: Caolán McNamara diff --git a/icon-themes/sukapura/svx/res/markers.png b/icon-themes/sukapura/svx/res/markers.png index 38c2f92c6047..0ce89a9f3275 100644 Binary files a/icon-themes/sukapura/svx/res/markers.png and b/icon-themes/sukapura/svx/res/markers.png differ diff --git a/icon-themes/sukapura_svg/svx/res/markers.svg b/icon-themes/sukapura_svg/svx/res/markers.svg index d6bedcbca334..ba34c35ad91d 100644 --- a/icon-themes/sukapura_svg/svx/res/markers.svg +++ b/icon-themes/sukapura_svg/svx/res/markers.svg @@ -1 +1 @@ -http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink";>< linearGradient id="ad" gradientUnits="userSpaceOnUse" x1="38.5" x2="38.5" xlink:href="#t" y1="30" y2="23"/>< path d="m53 16.50002a4.5 4.5 0 0 1 -4.5 4.5 4.5 4.5 0 0 1 -4.5-4.5 4.5 4.5 0 0 1 4.5-4.5 4.5 4.5 0 0 1 4.5 4.5z" fill="url(#at)"/> \ No newline at end of file +http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink";>< linearGradient id="ad" gradientUnits="userSpaceOnUse" x1="38.5" x2="38.5" xlink:href="#t" y1="30" y2="23"/> \ 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: icon-themes/sukapura icon-themes/sukapura_svg
icon-themes/sukapura/svx/res/symphony/Indent2.png |binary icon-themes/sukapura/svx/res/symphony/Indent3.png |binary icon-themes/sukapura/svx/res/symphony/Indent4.png |binary icon-themes/sukapura/svx/res/symphony/spacing1.png |binary icon-themes/sukapura/svx/res/symphony/spacing2.png |binary icon-themes/sukapura_svg/svx/res/symphony/Indent2.svg |2 +- icon-themes/sukapura_svg/svx/res/symphony/Indent3.svg |2 +- icon-themes/sukapura_svg/svx/res/symphony/Indent4.svg |2 +- icon-themes/sukapura_svg/svx/res/symphony/spacing1.svg |2 +- icon-themes/sukapura_svg/svx/res/symphony/spacing2.svg |2 +- 10 files changed, 5 insertions(+), 5 deletions(-) New commits: commit e5a4149fb909cd1c28488d2d88534b59df738339 Author: Rizal Muttaqin AuthorDate: Sun Apr 11 12:26:29 2021 +0700 Commit: Rizal Muttaqin CommitDate: Sun Apr 11 12:20:03 2021 +0200 Sukapura: tdf#141617 fix inconsistent spacing and indentation icons Change-Id: Id41c5632b3532e84f4486625e9bd4731c86f0272 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113936 Tested-by: Jenkins Reviewed-by: Rizal Muttaqin diff --git a/icon-themes/sukapura/svx/res/symphony/Indent2.png b/icon-themes/sukapura/svx/res/symphony/Indent2.png index 31494573aaa5..1993fd49d41e 100644 Binary files a/icon-themes/sukapura/svx/res/symphony/Indent2.png and b/icon-themes/sukapura/svx/res/symphony/Indent2.png differ diff --git a/icon-themes/sukapura/svx/res/symphony/Indent3.png b/icon-themes/sukapura/svx/res/symphony/Indent3.png index d6144a78c445..2555d37c7287 100644 Binary files a/icon-themes/sukapura/svx/res/symphony/Indent3.png and b/icon-themes/sukapura/svx/res/symphony/Indent3.png differ diff --git a/icon-themes/sukapura/svx/res/symphony/Indent4.png b/icon-themes/sukapura/svx/res/symphony/Indent4.png index e78ebf5778b1..aa995d8d63c5 100644 Binary files a/icon-themes/sukapura/svx/res/symphony/Indent4.png and b/icon-themes/sukapura/svx/res/symphony/Indent4.png differ diff --git a/icon-themes/sukapura/svx/res/symphony/spacing1.png b/icon-themes/sukapura/svx/res/symphony/spacing1.png index 8c1ee9f72a9b..3fa8a2cc4812 100644 Binary files a/icon-themes/sukapura/svx/res/symphony/spacing1.png and b/icon-themes/sukapura/svx/res/symphony/spacing1.png differ diff --git a/icon-themes/sukapura/svx/res/symphony/spacing2.png b/icon-themes/sukapura/svx/res/symphony/spacing2.png index ef79c6a79eef..d0d2aeefc60d 100644 Binary files a/icon-themes/sukapura/svx/res/symphony/spacing2.png and b/icon-themes/sukapura/svx/res/symphony/spacing2.png differ diff --git a/icon-themes/sukapura_svg/svx/res/symphony/Indent2.svg b/icon-themes/sukapura_svg/svx/res/symphony/Indent2.svg index e571b2c6e43b..2b821a965cef 100644 --- a/icon-themes/sukapura_svg/svx/res/symphony/Indent2.svg +++ b/icon-themes/sukapura_svg/svx/res/symphony/Indent2.svg @@ -1 +1 @@ -http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink";> \ No newline at end of file +http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink";> \ No newline at end of file diff --git a/icon-themes/sukapura_svg/svx/res/symphony/Indent3.svg b/icon-themes/sukapura_svg/svx/res/symphony/Indent3.svg index 74d70d341b06..fd75b24b42eb 100644 --- a/icon-themes/sukapura_svg/svx/res/symphony/Indent3.svg +++ b/icon-themes/sukapura_svg/svx/res/symphony/Indent3.svg @@ -1 +1 @@ -http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink";> \ No newline at end of file +http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink";> \ No newline at end of file diff --git a/icon-themes/sukapura_svg/svx/res/symphony/Indent4.svg b/icon-themes/sukapura_svg/svx/res/symphony/Indent4.svg index c5f456518e28..21f4c10e4701 100644 --- a/icon-themes/sukapura_svg/svx/res/symphony/Indent4.svg +++ b/icon-themes/sukapura_svg/svx/res/symphony/Indent4.svg @@ -1 +1 @@ -http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink";> \ No newline at end of file +http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink";> \ No newline at end of file diff --git a/icon-themes/sukapura_svg/svx/res/symphony/spacing1.svg b/icon-themes/sukapura_svg/svx/res/symphony/spacing1.svg index 71d18cf71b95..4809f7238d84 100644 --- a/icon-themes/sukapura_svg/svx/res/symphony/spacing1.svg +++ b/icon-themes/sukapura_svg/svx/res/symphony/spacing1.svg @@ -1 +1 @@ -http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink";> \ No newline at end of file +http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink";> \ No newline at end of file diff --git a/icon-themes/sukapura_svg/svx/res/symphony/spacing2.svg b/icon-themes/sukapura_svg/svx/res/symphony/spacing2.svg index 9e878400d2bd..bd9dd579da3f 100644 --- a/icon-themes/sukapura_svg/svx/res/symphony/spacing2.svg +++ b/icon-themes/sukapura_svg/svx/res/symphony/spacing2.svg @@ -1 +1 @@ -http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink";> \ No newl
[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - vcl/qt5
vcl/qt5/Qt5Clipboard.cxx |9 + 1 file changed, 9 insertions(+) New commits: commit 1aae26d04a9eb219979a75e7d4c5fe6afb26d162 Author: Jan-Marek Glogowski AuthorDate: Tue Apr 6 01:41:08 2021 +0200 Commit: Jan-Marek Glogowski CommitDate: Sun Apr 11 14:42:59 2021 +0200 tdf#140404 Qt ignore "unchanged" clipboard events LO gets a Qt signal on all clipboard changes. For X11 you get one signal when you set the clipboard. Anything else normally signals lost of clipboard ownership. But on Wayland LO somehow gets a second notification without any actual change. AFAIK it's not triggered by any LO actions and isOwner still indicates, that LO has the ownership. This breaks the single notification assumption, the code was relying on. Initially I found it quite tricky to find a rule to identify the ignorable change signals. Change-Id: I744cdd3c4254533b01d909309ecc3967d789361e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113617 Reviewed-by: Michael Weghorn Reviewed-by: Ilmari Lauhakangas Reviewed-by: Jan-Marek Glogowski Tested-by: Jenkins (cherry picked from commit 71471a36b125f6bdc915d5dbcae92ebcaa7ff5a4) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113641 diff --git a/vcl/qt5/Qt5Clipboard.cxx b/vcl/qt5/Qt5Clipboard.cxx index 8720cfe44310..41881f0be4b6 100644 --- a/vcl/qt5/Qt5Clipboard.cxx +++ b/vcl/qt5/Qt5Clipboard.cxx @@ -150,6 +150,15 @@ void Qt5Clipboard::handleChanged(QClipboard::Mode aMode) osl::ClearableMutexGuard aGuard(m_aMutex); +// QtWayland will send a second change notification (seemingly without any +// trigger). And any C'n'P operation in the Qt file picker emits a signal, +// with LO still holding the clipboard ownership, but internally having lost +// it. So ignore any signal, which still delivers the internal Qt5MimeData +// as the clipboard content and is no "advertised" change. +if (!m_bOwnClipboardChange && isOwner(aMode) +&& dynamic_cast(QApplication::clipboard()->mimeData(aMode))) +return; + css::uno::Reference xOldOwner(m_aOwner); css::uno::Reference xOldContents(m_aContents); // ownership change from LO POV is handled in setContents ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/filter/excel/impop.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 7c2e6058439da9d061e5e0bbd07c8b6d4f2ffcbf
Author: Caolán McNamara
AuthorDate: Sun Apr 11 11:08:40 2021 +0100
Commit: Caolán McNamara
CommitDate: Sun Apr 11 14:48:18 2021 +0200
require only as much remaining data as is necessary
Change-Id: If26562a7d5bede1dea414cbe24871b1dd75bfe23
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113943
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/sc/source/filter/excel/impop.cxx b/sc/source/filter/excel/impop.cxx
index b461642a13cd..fdc360ff4fcc 100644
--- a/sc/source/filter/excel/impop.cxx
+++ b/sc/source/filter/excel/impop.cxx
@@ -861,7 +861,7 @@ void ImportExcel::Mulrk()
XclAddress aXclPos;
aIn >> aXclPos;
-for( XclAddress aCurrXclPos( aXclPos ); (aXclPos.mnCol <=
aCurrXclPos.mnCol) && (aIn.GetRecLeft() > 6); ++aCurrXclPos.mnCol )
+for( XclAddress aCurrXclPos( aXclPos ); (aXclPos.mnCol <=
aCurrXclPos.mnCol) && (aIn.GetRecLeft() >= 6); ++aCurrXclPos.mnCol )
{
sal_uInt16 nXF = aIn.ReaduInt16();
sal_Int32 nRkNum = aIn.ReadInt32();
@@ -880,7 +880,7 @@ void ImportExcel::Mulblank()
XclAddress aXclPos;
aIn >> aXclPos;
-for( XclAddress aCurrXclPos( aXclPos ); (aXclPos.mnCol <=
aCurrXclPos.mnCol) && (aIn.GetRecLeft() > 2); ++aCurrXclPos.mnCol )
+for( XclAddress aCurrXclPos( aXclPos ); (aXclPos.mnCol <=
aCurrXclPos.mnCol) && (aIn.GetRecLeft() >= 2); ++aCurrXclPos.mnCol )
{
sal_uInt16 nXF = aIn.ReaduInt16();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/filter/excel/xiescher.cxx |8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
New commits:
commit 2f4684ac3950fe34d234a5c2334000af9396fec4
Author: Caolán McNamara
AuthorDate: Sat Apr 10 12:50:59 2021 +0100
Commit: Caolán McNamara
CommitDate: Sun Apr 11 15:30:46 2021 +0200
cid#1473782 silence Untrusted loop bound
Change-Id: I5c6bd57f2ffbce4a8adf794c46aeb62cae5c6604
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113947
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/sc/source/filter/excel/xiescher.cxx
b/sc/source/filter/excel/xiescher.cxx
index 1a5ce0638e60..231f0097148c 100644
--- a/sc/source/filter/excel/xiescher.cxx
+++ b/sc/source/filter/excel/xiescher.cxx
@@ -4256,8 +4256,14 @@ void XclImpSheetDrawing::ReadNote3( XclImpStream& rStrm )
sal_uInt16 nPartLen = ::std::min( nTotalLen, static_cast< sal_uInt16 >(
rStrm.GetRecLeft() ) );
OUStringBuffer aNoteText = rStrm.ReadRawByteString( nPartLen );
nTotalLen = nTotalLen - nPartLen;
-while( (nTotalLen > 0) && (rStrm.GetNextRecId() == EXC_ID_NOTE) &&
rStrm.StartNextRecord() )
+while (true)
{
+if (!nTotalLen)
+break;
+if (rStrm.GetNextRecId() != EXC_ID_NOTE)
+break;
+if (!rStrm.StartNextRecord())
+break;
rStrm >> aXclPos;
nPartLen = rStrm.ReaduInt16();
OSL_ENSURE( aXclPos.mnRow == 0x, "XclImpObjectManager::ReadNote3 -
missing continuation NOTE record" );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Package_html_media.mk source/media source/text
Package_html_media.mk | 12 source/media/helpimg/sc_func_imcot.svg | 233 --- source/media/helpimg/sc_func_imcsc.svg | 490 --- source/media/helpimg/sc_func_imcsch.svg| 498 --- source/media/helpimg/sc_func_imsec.svg | 490 --- source/media/helpimg/sc_func_imsech.svg| 498 --- source/media/helpimg/sc_func_imtan.svg | 796 - source/media/helpimg/scalc/IMCOT_equation.svg | 449 ++ source/media/helpimg/scalc/IMCSCH_equation.svg | 553 + source/media/helpimg/scalc/IMCSC_equation.svg | 549 + source/media/helpimg/scalc/IMSECH_equation.svg | 553 + source/media/helpimg/scalc/IMSEC_equation.svg | 549 + source/media/helpimg/scalc/IMTAN_equation.svg | 449 ++ source/text/scalc/01/func_imcot.xhp|2 source/text/scalc/01/func_imcsc.xhp|2 source/text/scalc/01/func_imcsch.xhp |3 source/text/scalc/01/func_imsec.xhp|2 source/text/scalc/01/func_imsech.xhp |2 source/text/scalc/01/func_imtan.xhp|2 19 files changed, 3115 insertions(+), 3017 deletions(-) New commits: commit d055e8d2ab5182def772050c8abdc54725a7814a Author: Steve Fanning AuthorDate: Sat Apr 10 20:35:48 2021 -0300 Commit: Olivier Hallot CommitDate: Sun Apr 11 16:09:19 2021 +0200 Help Pages for Calc’s “IM” Functions, Improved Equations I have recently spent some time updating the pages of the Calc Functions Wiki that relate to the processing of complex numbers. There are 25 functions in Calc’s Add-In category that have names beginning with the letters “IM” and these are all concerned with processing complex numbers of the form “a+bi”. Of these 25, there are 6 trigonometric functions (IMCOS, IMCOT, IMCSC, IMSEC, IMSIN, and IMTAN) and 4 hyperbolic functions (IMCOSH, IMCSCH, IMSECH, and IMSINH). For these 10, the current help pages include equations to assist the user’s understanding of the function’s purpose. I feel that some of these equations should be replaced with more appropriate equations that reflect how the software functions (see /core/scaddins/source/analysis/analysishelper.cxx) and these proposed changes are listed below. Change-Id: Ie0e4957e374570d60be00bcbe9b9015acab5e3a1 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/113935 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/Package_html_media.mk b/Package_html_media.mk index 2fb33193b..625805576 100644 --- a/Package_html_media.mk +++ b/Package_html_media.mk @@ -80,14 +80,14 @@ $(eval $(call gb_Package_add_files_with_dir,helpcontent2_html_media,$(LIBO_SHARE helpimg/sc_cell_with_comment_displayed.png \ helpimg/sc_func_imcos.svg \ helpimg/sc_func_imcosh.svg \ -helpimg/sc_func_imcot.svg \ +helpimg/scalc/IMCOT_equation.svg \ helpimg/sc_func_imsin.svg \ helpimg/sc_func_imsinh.svg \ -helpimg/sc_func_imcsc.svg \ -helpimg/sc_func_imcsch.svg \ -helpimg/sc_func_imsec.svg \ -helpimg/sc_func_imsech.svg \ -helpimg/sc_func_imtan.svg \ +helpimg/scalc/IMCSC_equation.svg \ +helpimg/scalc/IMCSCH_equation.svg \ +helpimg/scalc/IMSEC_equation.svg \ +helpimg/scalc/IMSECH_equation.svg \ +helpimg/scalc/IMTAN_equation.svg \ helpimg/sc_func_opt01.svg \ helpimg/sd_drawing_with_comment.png \ helpimg/sd_PresenterConsole01.png \ diff --git a/source/media/helpimg/sc_func_imcot.svg b/source/media/helpimg/sc_func_imcot.svg deleted file mode 100644 index 642d1a7a2..0 --- a/source/media/helpimg/sc_func_imcot.svg +++ /dev/null @@ -1,233 +0,0 @@ - -https://sourceforge.net/projects/pmml2svg/"; - xmlns:dc="http://purl.org/dc/elements/1.1/"; - xmlns:cc="http://creativecommons.org/ns#"; - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"; - xmlns:svg="http://www.w3.org/2000/svg"; - xmlns="http://www.w3.org/2000/svg"; - id="svg60" - viewBox="0 0 259.194434 54.9625006" - height="54.9625006px" - width="259.194434px" - version="1.1"> - - -24.1375003 - - -image/svg+xml -http://purl.org/dc/dcmitype/StillImage"; /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 4ffe58c5be712072387a8403dca8ba3cbc1df35a Author: Steve Fanning AuthorDate: Sun Apr 11 11:09:19 2021 -0300 Commit: Gerrit Code Review CommitDate: Sun Apr 11 16:09:19 2021 +0200 Update git submodules * Update helpcontent2 from branch 'master' to d055e8d2ab5182def772050c8abdc54725a7814a - Help Pages for Calc’s “IM” Functions, Improved Equations I have recently spent some time updating the pages of the Calc Functions Wiki that relate to the processing of complex numbers. There are 25 functions in Calc’s Add-In category that have names beginning with the letters “IM” and these are all concerned with processing complex numbers of the form “a+bi”. Of these 25, there are 6 trigonometric functions (IMCOS, IMCOT, IMCSC, IMSEC, IMSIN, and IMTAN) and 4 hyperbolic functions (IMCOSH, IMCSCH, IMSECH, and IMSINH). For these 10, the current help pages include equations to assist the user’s understanding of the function’s purpose. I feel that some of these equations should be replaced with more appropriate equations that reflect how the software functions (see /core/scaddins/source/analysis/analysishelper.cxx) and these proposed changes are listed below. Change-Id: Ie0e4957e374570d60be00bcbe9b9015acab5e3a1 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/113935 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 308ebcecc9e8..d055e8d2ab51 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 308ebcecc9e88de8422a0a44599b77ce0f2b73d9 +Subproject commit d055e8d2ab5182def772050c8abdc54725a7814a ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/core/data/documen2.cxx |5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 47b1d193b6e1537103c1774f4f045d9fa4210220
Author: Caolán McNamara
AuthorDate: Sun Apr 11 14:29:37 2021 +0100
Commit: Caolán McNamara
CommitDate: Sun Apr 11 17:02:25 2021 +0200
ofz#32908 avoid Timeout
Change-Id: I560a5ff4caf204cc46d6cfb5f7680328295020fd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113949
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx
index ce47333cd14c..3191e3d5f816 100644
--- a/sc/source/core/data/documen2.cxx
+++ b/sc/source/core/data/documen2.cxx
@@ -36,6 +36,7 @@
#include
#include
#include
+#include
#include
#include
@@ -192,8 +193,8 @@ ScDocument::ScDocument( ScDocumentMode eMode,
SfxObjectShell* pDocShell ) :
if ( eMode == SCDOCMODE_DOCUMENT || eMode == SCDOCMODE_FUNCTIONACCESS )
{
mxPoolHelper = new ScPoolHelper( *this );
-
-pBASM.reset( new ScBroadcastAreaSlotMachine( this ) );
+if (!utl::ConfigManager::IsFuzzing()) //just too slow
+pBASM.reset( new ScBroadcastAreaSlotMachine( this ) );
pChartListenerCollection.reset( new ScChartListenerCollection( *this )
);
pRefreshTimerControl.reset( new ScRefreshTimerControl );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: xmloff/source
xmloff/source/draw/ximpstyl.cxx |5 +
1 file changed, 5 insertions(+)
New commits:
commit 87586cd0e41b1dbcbf49df993d69ef7aa426f7e0
Author: Caolán McNamara
AuthorDate: Sun Apr 11 14:42:33 2021 +0100
Commit: Caolán McNamara
CommitDate: Sun Apr 11 17:03:45 2021 +0200
ofz#32467 Timeout: add arbitrary master page limit when fuzzing
Change-Id: Ic95b84ceb91ccadf9d4f2dd763a4f4ec7b379381
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113950
Tested-by: Caolán McNamara
Reviewed-by: Caolán McNamara
diff --git a/xmloff/source/draw/ximpstyl.cxx b/xmloff/source/draw/ximpstyl.cxx
index e606c223b39d..a702872a736b 100644
--- a/xmloff/source/draw/ximpstyl.cxx
+++ b/xmloff/source/draw/ximpstyl.cxx
@@ -48,6 +48,7 @@
#include "layerimp.hxx"
#include
#include
+#include
#include
#include
@@ -1318,6 +1319,10 @@ css::uno::Reference< css::xml::sax::XFastContextHandler
> SdXMLMasterStylesConte
sal_Int32 nMasterPageCount = xMasterPages->getCount();
if (nNewMasterPageCount + 1 > nMasterPageCount)
{
+// arbitrary limit to master pages when fuzzing to avoid
deadend timeouts
+if (nMasterPageCount >= 64 && utl::ConfigManager::IsFuzzing())
+return nullptr;
+
// new page, create and insert
xNewMasterPage =
xMasterPages->insertNewByIndex(nMasterPageCount);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: desktop/win32
desktop/win32/source/loader.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 10c02f69106a248f3c0514b36ec95895ce98d8d7
Author: Noel Grandin
AuthorDate: Sun Apr 11 10:51:54 2021 +0200
Commit: Noel Grandin
CommitDate: Sun Apr 11 17:08:54 2021 +0200
we where -> we were
Change-Id: I993442061ac59e1ecd86b7d97a3e52c561987878
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113942
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/desktop/win32/source/loader.cxx b/desktop/win32/source/loader.cxx
index 82b323d7c772..b0e3c2a691e4 100644
--- a/desktop/win32/source/loader.cxx
+++ b/desktop/win32/source/loader.cxx
@@ -346,7 +346,7 @@ int officeloader_impl(bool bAllowConsole)
do
{
// On Windows XP it seems as the desktop calls
WaitForInputIdle after "OpenWith" so
-// we have to do so as if we where processing any messages
+// we have to do so as if we here processing any messages
dwWaitResult = MsgWaitForMultipleObjects(1,
&aProcessInfo.hProcess, FALSE, INFINITE,
QS_ALLEVENTS);
@@ -453,7 +453,7 @@ int unopkgloader_impl(bool bAllowConsole)
do
{
// On Windows XP it seems as the desktop calls WaitForInputIdle
after "OpenWidth" so we have to do so
-// as if we where processing any messages
+// as if we were processing any messages
dwWaitResult = MsgWaitForMultipleObjects(1,
&aProcessInfo.hProcess, FALSE, INFINITE, QS_ALLEVENTS);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: external/epoxy
external/epoxy/UnpackedTarball_epoxy.mk|1 +
external/epoxy/epoxy.pyresource-leak.patch | 13 +
2 files changed, 14 insertions(+)
New commits:
commit 84962c21b41d2e65546486cb73e7f3785487265a
Author: Jan-Marek Glogowski
AuthorDate: Sun Apr 11 14:16:42 2021 +0200
Commit: Jan-Marek Glogowski
CommitDate: Sun Apr 11 17:54:13 2021 +0200
epoxy: fix gen_dispatch.py fildescriptor leak
Change-Id: I3f7bd1befffb45b12bc178f9addf1445a6c33921
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113944
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski
diff --git a/external/epoxy/UnpackedTarball_epoxy.mk
b/external/epoxy/UnpackedTarball_epoxy.mk
index 8dce1ba9d745..2de800ec1ca0 100644
--- a/external/epoxy/UnpackedTarball_epoxy.mk
+++ b/external/epoxy/UnpackedTarball_epoxy.mk
@@ -30,6 +30,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,epoxy, \
external/epoxy/epoxy.windows.api.patch \
external/epoxy/epoxy.noegl.by.default.patch \
external/epoxy/clang-cl.patch \
+external/epoxy/epoxy.pyresource-leak.patch \
))
# vim: set noet sw=4 ts=4:
diff --git a/external/epoxy/epoxy.pyresource-leak.patch
b/external/epoxy/epoxy.pyresource-leak.patch
new file mode 100644
index ..d9fc684254aa
--- /dev/null
+++ b/external/epoxy/epoxy.pyresource-leak.patch
@@ -0,0 +1,13 @@
+--- src/gen_dispatch.py.orig 2020-09-30 06:33:23.765680489 +0200
src/gen_dispatch.py2020-09-30 06:37:07.719152050 +0200
+@@ -182,6 +182,10 @@
+ # provided the name of the symbol to be requested.
+ self.provider_loader = {}
+
++def __del__(self):
++if self.out_file is not None:
++close(self.out_file)
++
+ def all_text_until_element_name(self, element, element_name):
+ text = ''
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: wizards/source
wizards/source/scriptforge/SF_PythonHelper.xba | 12 ++--
wizards/source/scriptforge/python/scriptforge.py | 60 ++-
wizards/source/sfdatabases/SF_Database.xba |3 -
3 files changed, 67 insertions(+), 8 deletions(-)
New commits:
commit 77cb68db10cdd0dac9409cff0f59637b25e6d9a7
Author: Jean-Pierre Ledure
AuthorDate: Sun Apr 11 17:17:46 2021 +0200
Commit: Jean-Pierre Ledure
CommitDate: Sun Apr 11 18:33:59 2021 +0200
ScriptForge - (scriptforge.py) Database class
New class to run from Python DDL + DML SQL commands
on databases embedded in or connected to Base documents.
GetRows() is hardcoded as an exception (cfr. bug #138155) in
_PythonDispatcher() - SF_PythonHelper.xba
to be able to return 2D arrays to Python.
Fix returned empty arrays in the Basic-Python engine:
the standard bridge ignores them and returns a null byte
sequence instead of an empty tuple.
Change-Id: I336ea0b585b759b998af0871d25bfd384a2e66ae
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113953
Tested-by: Jean-Pierre Ledure
Tested-by: Jenkins
Reviewed-by: Jean-Pierre Ledure
diff --git a/wizards/source/scriptforge/SF_PythonHelper.xba
b/wizards/source/scriptforge/SF_PythonHelper.xba
index 328978033290..69306d1f8884 100644
--- a/wizards/source/scriptforge/SF_PythonHelper.xba
+++ b/wizards/source/scriptforge/SF_PythonHelper.xba
@@ -708,8 +708,10 @@ Try:
ElseIf ((CallType And vbMethod) + (CallType And
cstArgArray)) = vbMethod + cstArgArray Or _
((CallType And vbMethod) + (CallType And
cstRetArray)) = vbMethod + cstRetArray Then
Select Case sServiceName
+ Case "SFDatabases.Database"
+ If Script = "GetRows"
ThenvReturn = vBasicObject.GetRows(vArgs(0), vArgs(1), vArgs(2),
vArgs(3))
Case "SFDocuments.Document"
- If Script = "Forms"
Then vReturn = vBasicObject.Forms(vArgs(0))
+ If Script = "Forms"
Then vReturn = vBasicObject.Forms(vArgs(0))
Case "SFDocuments.Base"
Select Case Script
Case
"FormDocuments" : vReturn = vBasicObject.FormDocuments()
@@ -726,13 +728,11 @@ Try:
End Select
Case "SFDocuments.Form"
Select Case Script
- Case
"Controls" : vReturn =
vBasicObject.Controls(vArgs(0))
- Case
"Subforms" : vReturn =
vBasicObject.Subforms(vArgs(0))
+ Case
"Controls" : vReturn =
vBasicObject.Controls(vArgs(0))
+ Case
"Subforms" : vReturn =
vBasicObject.Subforms(vArgs(0))
End Select
Case "SFDocuments.FormControl"
- Select Case Script
- Case
"Controls" : vReturn =
vBasicObject.Controls(vArgs(0))
- End Select
+ If Script =
"Controls" Then vReturn = vBasicObject.Controls(vArgs(0))
End Select
' Methods in class modules are invoked with
CallByName
diff --git a/wizards/source/scriptforge/python/scriptforge.py
b/wizards/source/scriptforge/python/scriptforge.py
index e3d4bdfa63e6..d722b3ca2f1a 100644
--- a/wizards/source/scriptforge/python/scriptforge.py
+++ b/wizards/source/scriptforge/python/scriptforge.py
@@ -311,7 +311,9 @@ class ScriptForge(object, metaclass = _Singleton):
return subcls(returntuple[cstValue], returntuple[cstType],
returntuple[cstClass],
returntuple[cstName])
elif returntuple[cstVarType] >= ScriptForge.V_ARRAY:
-pass
+# Intercept empty array
+if isinstance(returntuple[cstValue], uno.ByteSequence):
+return ()
elif returntuple[cstVarType] == ScriptForge.V_DATE:
try:# Anticipate fromisoformat('00:00:00') and alike
dat = None
@@ -1339,6 +1341,62 @@ class SFScriptForge:
return self.Execute(self.vbMethod, 'WindowExists', windowname)
[Libreoffice-commits] core.git: sw/source
sw/source/filter/html/htmltab.cxx | 23 +--
1 file changed, 13 insertions(+), 10 deletions(-)
New commits:
commit 3f9127d149492b572aebd32a3baee040b4c8d30b
Author: Caolán McNamara
AuthorDate: Sun Apr 11 14:59:09 2021 +0100
Commit: Caolán McNamara
CommitDate: Sun Apr 11 19:40:40 2021 +0200
ofz#26099 skip slow path when fuzzing
Change-Id: Idef5a50733bc4bdef45ea613b4833df0b9d7c9e0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113952
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/sw/source/filter/html/htmltab.cxx
b/sw/source/filter/html/htmltab.cxx
index a9e403e94519..b56a016e8d74 100644
--- a/sw/source/filter/html/htmltab.cxx
+++ b/sw/source/filter/html/htmltab.cxx
@@ -2291,16 +2291,19 @@ void HTMLTable::MakeTable( SwTableBox *pBox, sal_uInt16
nAbsAvail,
// Step 1: needed layout structures are created (including tables in
tables)
CreateLayoutInfo();
-// Step 2: the minimal and maximal column width is calculated
-// (including tables in tables). Since we don't have boxes yet,
-// we'll work on the start nodes
-m_xLayoutInfo->AutoLayoutPass1();
-
-// Step 3: the actual column widths of this table are calculated (not
tables in tables)
-// We need this now to decide if we need filler cells
-// (Pass1 was needed because of this as well)
-m_xLayoutInfo->AutoLayoutPass2( nAbsAvail, nRelAvail, nAbsLeftSpace,
- nAbsRightSpace, nInhAbsSpace );
+if (!utl::ConfigManager::IsFuzzing()) // skip slow path for fuzzing
+{
+// Step 2: the minimal and maximal column width is calculated
+// (including tables in tables). Since we don't have boxes yet,
+// we'll work on the start nodes
+m_xLayoutInfo->AutoLayoutPass1();
+
+// Step 3: the actual column widths of this table are calculated (not
tables in tables)
+// We need this now to decide if we need filler cells
+// (Pass1 was needed because of this as well)
+m_xLayoutInfo->AutoLayoutPass2( nAbsAvail, nRelAvail, nAbsLeftSpace,
+ nAbsRightSpace, nInhAbsSpace );
+}
// Set adjustment for the top table
sal_Int16 eHoriOri;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: hwpfilter/source
hwpfilter/source/hwpread.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 83f91d82f34922346209c11f4b8be8ad93813e79
Author: Andrea Gelmini
AuthorDate: Sun Apr 11 17:27:40 2021 +0200
Commit: Julien Nabet
CommitDate: Sun Apr 11 20:25:07 2021 +0200
Fix typo
Change-Id: Ia6fc35fa8e6c43686b84e441ea3949b7ecbb78a0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113954
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/hwpfilter/source/hwpread.cxx b/hwpfilter/source/hwpread.cxx
index b3eb5504a0d6..28506b369dac 100644
--- a/hwpfilter/source/hwpread.cxx
+++ b/hwpfilter/source/hwpread.cxx
@@ -288,7 +288,7 @@ bool TxtBox::Read(HWPFile & hwpf)
}
if (ncell > 4096 && utl::ConfigManager::IsFuzzing()) {
-// cut off at an arbitary size to speed up fuzzing
+// cut off at an arbitrary size to speed up fuzzing
return hwpf.SetState(HWP_InvalidFileFormat);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svx/source
svx/source/engine3d/obj3d.cxx |4
1 file changed, 4 insertions(+)
New commits:
commit ae8bde1b03335a096ea2acd7fe20a6f1a326ba35
Author: Caolán McNamara
AuthorDate: Sun Apr 11 14:51:03 2021 +0100
Commit: Caolán McNamara
CommitDate: Sun Apr 11 20:42:46 2021 +0200
ofz#30962 Timeout: skip slow path for fuzzing
Change-Id: I49c3b06e9b54d9d6657b64b153907f995e572a19
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113951
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/svx/source/engine3d/obj3d.cxx b/svx/source/engine3d/obj3d.cxx
index c770a751018a..441e3271d34d 100644
--- a/svx/source/engine3d/obj3d.cxx
+++ b/svx/source/engine3d/obj3d.cxx
@@ -40,6 +40,7 @@
#include
#include
#include
+#include
using namespace com::sun::star;
@@ -290,6 +291,9 @@ E3dScene* E3dObject::getRootE3dSceneFromE3dObject() const
basegfx::B3DRange E3dObject::RecalcBoundVolume() const
{
basegfx::B3DRange aRetval;
+if (utl::ConfigManager::IsFuzzing()) // skip slow path for fuzzing
+return aRetval;
+
const sdr::contact::ViewContactOfE3d* pVCOfE3D = dynamic_cast< const
sdr::contact::ViewContactOfE3d* >(&GetViewContact());
if(pVCOfE3D)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/qt5
vcl/qt5/Qt5Frame.cxx |8
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 91c883e75436210ca8af95df1ca597caeeda8703
Author: Jan-Marek Glogowski
AuthorDate: Sun Apr 11 17:21:57 2021 +0200
Commit: Jan-Marek Glogowski
CommitDate: Sun Apr 11 21:13:11 2021 +0200
tdf#141623 Qt5+cairo init surface with widget size
The QFont based rendering path directly uses the widgets size to
initialize the QImage buffer image, so do the same for the Cairo
surface, instead of the arbitrarily size of 640x480.
Change-Id: I91326dab67cbbb5e75b78b02c34eaca61ad26482
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113955
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski
diff --git a/vcl/qt5/Qt5Frame.cxx b/vcl/qt5/Qt5Frame.cxx
index f8f8d20dae6f..68f7a8120460 100644
--- a/vcl/qt5/Qt5Frame.cxx
+++ b/vcl/qt5/Qt5Frame.cxx
@@ -290,11 +290,11 @@ void Qt5Frame::Damage(sal_Int32 nExtentsX, sal_Int32
nExtentsY, sal_Int32 nExten
void Qt5Frame::InitQt5SvpGraphics(Qt5SvpGraphics* pQt5SvpGraphics)
{
-int width = 640;
-int height = 480;
+QSize aSize = m_pQWidget->size() * devicePixelRatioF();
m_pSvpGraphics = pQt5SvpGraphics;
-m_pSurface.reset(cairo_image_surface_create(CAIRO_FORMAT_ARGB32, width,
height));
-m_pSvpGraphics->setSurface(m_pSurface.get(), basegfx::B2IVector(width,
height));
+m_pSurface.reset(
+cairo_image_surface_create(CAIRO_FORMAT_ARGB32, aSize.width(),
aSize.height()));
+m_pSvpGraphics->setSurface(m_pSurface.get(),
basegfx::B2IVector(aSize.width(), aSize.height()));
cairo_surface_set_user_data(m_pSurface.get(),
Qt5SvpGraphics::getDamageKey(), &m_aDamageHandler,
nullptr);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/inc vcl/qt5 vcl/unx
vcl/inc/qt5/Qt5Frame.hxx |7 +--
vcl/inc/qt5/Qt5Instance.hxx|1 +
vcl/qt5/Qt5Frame.cxx | 28 +++-
vcl/unx/kf5/KF5SalFrame.cxx| 24
vcl/unx/kf5/KF5SalFrame.hxx|6 --
vcl/unx/kf5/KF5SalInstance.cxx | 13 +++--
vcl/unx/kf5/KF5SalInstance.hxx |1 +
7 files changed, 21 insertions(+), 59 deletions(-)
New commits:
commit 963f252cd1ea9c268a6ced68a3454b10cbee1a89
Author: Jan-Marek Glogowski
AuthorDate: Sun Apr 11 17:40:26 2021 +0200
Commit: Jan-Marek Glogowski
CommitDate: Sun Apr 11 21:13:50 2021 +0200
Qt5/KF5 get rid of unneeded own grahics handling
This was hiding tdf#141623, when I decided to implement the override
to run the kf5 VCL plugin with the qfont text rendering.
Change-Id: Id1fcd363bd77a756cb27e3a171c872ce792da5ad
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113956
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski
diff --git a/vcl/inc/qt5/Qt5Frame.hxx b/vcl/inc/qt5/Qt5Frame.hxx
index c07fda54ec40..828f212babfb 100644
--- a/vcl/inc/qt5/Qt5Frame.hxx
+++ b/vcl/inc/qt5/Qt5Frame.hxx
@@ -77,11 +77,7 @@ class VCLPLUG_QT5_PUBLIC Qt5Frame : public QObject, public
SalFrame
std::unique_ptr m_pQImage;
std::unique_ptr m_pQt5Graphics;
UniqueCairoSurface m_pSurface;
-std::unique_ptr m_pOurSvpGraphics;
-// in base class, this ptr is the same as m_pOurSvpGraphic
-// in derived class, it can point to a derivative
-// of Qt5SvpGraphics (which the derived class then owns)
-Qt5SvpGraphics* m_pSvpGraphics;
+std::unique_ptr m_pSvpGraphics;
DamageHandler m_aDamageHandler;
QRegion m_aRegion;
bool m_bNullRegion;
@@ -146,7 +142,6 @@ public:
void Damage(sal_Int32 nExtentsX, sal_Int32 nExtentsY, sal_Int32
nExtentsWidth,
sal_Int32 nExtentsHeight) const;
-void InitQt5SvpGraphics(Qt5SvpGraphics* pQt5SvpGraphics);
virtual SalGraphics* AcquireGraphics() override;
virtual void ReleaseGraphics(SalGraphics* pGraphics) override;
diff --git a/vcl/inc/qt5/Qt5Instance.hxx b/vcl/inc/qt5/Qt5Instance.hxx
index 8cfa9ac960f1..5dc2db898d29 100644
--- a/vcl/inc/qt5/Qt5Instance.hxx
+++ b/vcl/inc/qt5/Qt5Instance.hxx
@@ -83,6 +83,7 @@ protected:
virtual rtl::Reference
createPicker(css::uno::Reference const&
context,
QFileDialog::FileMode);
+bool useCairo() const { return m_bUseCairo; }
public:
explicit Qt5Instance(std::unique_ptr& pQApp, bool bUseCairo
= false);
diff --git a/vcl/qt5/Qt5Frame.cxx b/vcl/qt5/Qt5Frame.cxx
index 68f7a8120460..97cc7e938446 100644
--- a/vcl/qt5/Qt5Frame.cxx
+++ b/vcl/qt5/Qt5Frame.cxx
@@ -103,7 +103,6 @@ sal_Int32 screenNumber(const QScreen* pScreen)
Qt5Frame::Qt5Frame(Qt5Frame* pParent, SalFrameStyleFlags nStyle, bool
bUseCairo)
: m_pTopLevel(nullptr)
, m_bUseCairo(bUseCairo)
-, m_pSvpGraphics(nullptr)
, m_bNullRegion(true)
, m_bGraphicsInUse(false)
, m_bGraphicsInvalid(false)
@@ -288,17 +287,6 @@ void Qt5Frame::Damage(sal_Int32 nExtentsX, sal_Int32
nExtentsY, sal_Int32 nExten
1 / devicePixelRatioF()));
}
-void Qt5Frame::InitQt5SvpGraphics(Qt5SvpGraphics* pQt5SvpGraphics)
-{
-QSize aSize = m_pQWidget->size() * devicePixelRatioF();
-m_pSvpGraphics = pQt5SvpGraphics;
-m_pSurface.reset(
-cairo_image_surface_create(CAIRO_FORMAT_ARGB32, aSize.width(),
aSize.height()));
-m_pSvpGraphics->setSurface(m_pSurface.get(),
basegfx::B2IVector(aSize.width(), aSize.height()));
-cairo_surface_set_user_data(m_pSurface.get(),
Qt5SvpGraphics::getDamageKey(), &m_aDamageHandler,
-nullptr);
-}
-
SalGraphics* Qt5Frame::AcquireGraphics()
{
if (m_bGraphicsInUse)
@@ -308,13 +296,19 @@ SalGraphics* Qt5Frame::AcquireGraphics()
if (m_bUseCairo)
{
-if (!m_pOurSvpGraphics || m_bGraphicsInvalid)
+if (!m_pSvpGraphics || m_bGraphicsInvalid)
{
-m_pOurSvpGraphics.reset(new Qt5SvpGraphics(this));
-InitQt5SvpGraphics(m_pOurSvpGraphics.get());
+QSize aSize = m_pQWidget->size() * devicePixelRatioF();
+m_pSvpGraphics.reset(new Qt5SvpGraphics(this));
+m_pSurface.reset(
+cairo_image_surface_create(CAIRO_FORMAT_ARGB32, aSize.width(),
aSize.height()));
+m_pSvpGraphics->setSurface(m_pSurface.get(),
+ basegfx::B2IVector(aSize.width(),
aSize.height()));
+cairo_surface_set_user_data(m_pSurface.get(),
Qt5SvpGraphics::getDamageKey(),
+&m_aDamageHandler, nullptr);
m_bGraphicsInvalid = false;
}
-return m_pOurSvpGraphics.get();
+return m_pSvpGraphics.get();
}
else
{
@@ -335,7 +329,7 @@ void Qt5Frame::ReleaseGraphics(SalGraphics* pSalGraph)
{
(void)pSalGraph;
[Libreoffice-commits] core.git: vcl/README.vars vcl/unx
vcl/README.vars|4
vcl/unx/kf5/KF5SalInstance.cxx |8 +---
vcl/unx/kf5/KF5SalInstance.hxx |2 +-
3 files changed, 10 insertions(+), 4 deletions(-)
New commits:
commit 7a0e0a84a02f505200331c19b28d45e898cd5a12
Author: Jan-Marek Glogowski
AuthorDate: Sun Apr 11 14:09:09 2021 +0200
Commit: Jan-Marek Glogowski
CommitDate: Sun Apr 11 21:14:45 2021 +0200
KF5 allow changing the font backend to QFont
Implements SAL_VCL_KF5_USE_QFONT to switch the used font backend,
like SAL_VCL_QT5_USE_CAIRO for the qt5 backend.
Change-Id: If3f163973c2e251eafe3bd734fd7525a8127cbcf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113946
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski
diff --git a/vcl/README.vars b/vcl/README.vars
index 4b2e326d67ef..60551e1e4173 100644
--- a/vcl/README.vars
+++ b/vcl/README.vars
@@ -58,3 +58,7 @@ QT_SCALE_FACTOR=2 - for HiDPI testing (also supports float)
SAL_VCL_QT5_NO_FONTCONFIG - ignore fontconfig provided font substitutions
SAL_VCL_QT5_NO_NATIVE - disable QStyle'd controls
SAL_VCL_QT5_USE_CAIRO - use cairo for text rendering and fonts (default for
kf5, but not qt5)
+
+Kf5
+-
+SAL_VCL_KF5_USE_QFONT - use QFont for text rendering (default for qt5, but not
kf5)
diff --git a/vcl/unx/kf5/KF5SalInstance.cxx b/vcl/unx/kf5/KF5SalInstance.cxx
index c1ee2f61a48d..1335d4123a2e 100644
--- a/vcl/unx/kf5/KF5SalInstance.cxx
+++ b/vcl/unx/kf5/KF5SalInstance.cxx
@@ -33,8 +33,8 @@
using namespace com::sun::star;
-KF5SalInstance::KF5SalInstance(std::unique_ptr& pQApp)
-: Qt5Instance(pQApp, true)
+KF5SalInstance::KF5SalInstance(std::unique_ptr& pQApp, bool
bUseCairo)
+: Qt5Instance(pQApp, bUseCairo)
{
ImplSVData* pSVData = ImplGetSVData();
pSVData->maAppData.mxToolkitName = OUString("kf5");
@@ -82,6 +82,8 @@
KF5SalInstance::createPicker(css::uno::Reference co
extern "C" {
VCLPLUG_KF5_PUBLIC SalInstance* create_SalInstance()
{
+static const bool bUseCairo = (nullptr == getenv("SAL_VCL_KF5_USE_QFONT"));
+
std::unique_ptr pFakeArgv;
std::unique_ptr pFakeArgc;
std::vector aFakeArgvFreeable;
@@ -90,7 +92,7 @@ VCLPLUG_KF5_PUBLIC SalInstance* create_SalInstance()
std::unique_ptr pQApp
= Qt5Instance::CreateQApplication(*pFakeArgc, pFakeArgv.get());
-KF5SalInstance* pInstance = new KF5SalInstance(pQApp);
+KF5SalInstance* pInstance = new KF5SalInstance(pQApp, bUseCairo);
pInstance->MoveFakeCmdlineArgs(pFakeArgv, pFakeArgc, aFakeArgvFreeable);
new Qt5Data(pInstance);
diff --git a/vcl/unx/kf5/KF5SalInstance.hxx b/vcl/unx/kf5/KF5SalInstance.hxx
index 1d9ed8bc5d92..635f51ec9bc7 100644
--- a/vcl/unx/kf5/KF5SalInstance.hxx
+++ b/vcl/unx/kf5/KF5SalInstance.hxx
@@ -32,7 +32,7 @@ class KF5SalInstance final : public Qt5Instance
SalFrame* CreateChildFrame(SystemParentData* pParent, SalFrameStyleFlags
nStyle) override;
public:
-explicit KF5SalInstance(std::unique_ptr& pQApp);
+explicit KF5SalInstance(std::unique_ptr& pQApp, bool
bUseCairo);
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Problems with OutputDevice
On 1 Jan 2021, at 4:44 am, Chris Sherlock wrote:
>
> Parallel task: decouple metafile recording from drawing functionality
>
> My plan for this is to do the following:
>
> 1. I create a RenderContext2 class which OutputDevice derives from
> 2. Carefully and gradually move the drawing code into parallel drawing
> functions in RenderContext2. I keep the metafile recording functionality in
> OutputDevice and have it call on the parallel RenderContext drawing function.
>
> What this essentially does is implement a decorator pattern. This can be done
> gradually. In fact, when I looked at the code, the sequence of drawing
> functions look like they should be:
>
> a. state and mapping functions - beginning with push and pop, then the
> functions that set line colour, etc.
> b. clipping functions
> c. line and pixel drawing functions
> d. Ellipse, arc, pie and chord drawing functions
> e. Rectangle drawing functions
> f. Polygon drawing functions
> g. Polypolygon drawing functions
> h. Polyline drawing functions (this will be more tricky)
>
> The rest will be trickier to migrate and require a fair amount of refactoring
> to seperate them. I fully expect a bit of code duplication for a short time
> whilst the metafile code is seperated from the drawing code.
This is a followup to my email from the very beginning of the year.
It turns out that moving code into SalGraphics, whilst I still think
is a very good idea, is quite a bit more tricky than I had
anticipated. Therefore I have decided that the task of decoupling
metafile recording from actual drawing would be the first concrete
step I need to undertake.
To decouple metafile recording from actual rendering from
OutputDevice, I have created a new class, RenderContext2. This class
focuses on only rendering output and deliberately does not make any
attempt to do any metafile recording. Instead, I have made
OutputDevice a wrapper class that does metafile recording (if the
mpMetafile instance has been instantiated) and it then calls up the
corresponding RenderContext2 function to do the rendering.
Note: I have called it RenderContext2 because there is a
vcl::RenderContext in the codebase already, which is actually just a
typedef to OutputDevice.
Drawing lines is a good example. The line color is set as a distinct
rendering operation, but also is recorded in a metafile as an
action. Thus, the rendering functionality is now in RenderContext2:
void RenderContext2::SetLineColor()
{
if (mbLineColor)
{
mbInitLineColor = true;
mbLineColor = false;
maLineColor = COL_TRANSPARENT;
}
if (mpAlphaVDev)
mpAlphaVDev->SetLineColor();
}
And the recording is done in OutputDevice:
void OutputDevice::SetLineColor()
{
if (mpMetaFile)
mpMetaFile->AddAction(new MetaLineColorAction(Color(), false));
RenderContext2::SetLineColor();
}
As you can see, the metafile is recorded, and then OutputDevice
immediately calls upon the rendering class, RenderContext2.
I have done this to reduce the amount of code churn in the codebase.
OutputDevice works *exactly* the same as it always has, and we don’t
need to go through the code and replace all instances of
OutputDevice with RenderContext2.
I have endeavoured to reduce the amount of code that I have changed,
but this has not always been entirely possible. The following are
where I have diverted from the existing code:
- there was much code duplication in determining colors and fonts
depending on what DrawMode was set to. Thus I have introduced a
number of ancillary functions around the drawing mode - these can be
found in vcl/source/rendercontext/drawmode.cxx
- in order to migrate the EPS drawing code into RenderContext2, I
had to introduce Animation::IsLoopTerminated() and I had to migrate
the drawing functionality back into OutputDevice::DrawAnimation().
In order to get this fully working, unfortunately we have an
GetOutDevType() check in ImplAnimView::draw() and
ImplAnimView::drawToPos(), so I have also had to migrate this
functionality into RenderContext2 (for now), thus RenderContext2
also handles drawing the animation view.
- gradient code migration was especially tricky. The code for this
had metafile processing strongly intertwined into the rendering
code. Luckily quite a bit of it was separated already, which I had
done some time ago when I did some major function extractions in
this part of the codebase.
- the bitmap drawing code signatures were changed. Currently
DrawBitmap() and DrawBitmapEx() uses a MetaActionType (which used a
default value for the parameter in the case when it is called
directly anyway) to determine scaling and cropping. I have removed
this unnecessary parameter in both the functions in order to migrate
the rendering code to RenderContext2.
One are of the code that needs to be improved is there are now quite
a lot of protected member variables. Eventually I hope to remove the
need a lot of them, or place them behind
[Libreoffice-commits] core.git: android/source
android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java | 33
+-
1 file changed, 19 insertions(+), 14 deletions(-)
New commits:
commit 79d9a7349174a7e2b2aa7fcf324a6987edbbd555
Author: Michael Weghorn
AuthorDate: Thu Apr 8 14:06:05 2021 +0200
Commit: Michael Weghorn
CommitDate: Mon Apr 12 07:19:05 2021 +0200
android: Add member for document URI
Add a 'mDocumentUri' member in LibreOfficeMainActivity
to store the document URI rather than retrieving it from
the Intent using 'getIntent().getData()' all the time.
This is also in preparation to make it possible to change
the URI later, e.g. when doing a "Save As".
While at it, also switch to readonly mode for the
fallback to 'DEFAULT_DOC_PATH' (though I don't think
this should be relevant anyway).
Change-Id: I629bad1d743e458191dcfa2b1371ea4b280e7b13
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113878
Tested-by: Jenkins
Reviewed-by: Michael Weghorn
diff --git
a/android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java
b/android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java
index 6af44912bb52..2a391dab4c8d 100644
--- a/android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java
+++ b/android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java
@@ -82,6 +82,9 @@ public class LibreOfficeMainActivity extends
AppCompatActivity implements Settin
private int partIndex=-1;
private File mInputFile;
private DocumentOverlay mDocumentOverlay;
+/** URI of the actual document. */
+private Uri mDocumentUri;
+/** Temporary local copy of the document. */
private File mTempFile = null;
private File mTempSlideShowFile = null;
public boolean firstStart = true;
@@ -170,8 +173,9 @@ public class LibreOfficeMainActivity extends
AppCompatActivity implements Settin
mbISReadOnlyMode = !isExperimentalMode();
-if (getIntent().getData() != null) {
-if
(getIntent().getData().getScheme().equals(ContentResolver.SCHEME_CONTENT)) {
+mDocumentUri = getIntent().getData();
+if (mDocumentUri != null) {
+if
(mDocumentUri.getScheme().equals(ContentResolver.SCHEME_CONTENT)) {
final boolean isReadOnlyDoc;
if
(getIntent().getStringExtra(LibreOfficeUIActivity.NEW_DOC_TYPE_KEY) != null) {
// New document type string is not null, meaning we want
to open a new document
@@ -185,28 +189,30 @@ public class LibreOfficeMainActivity extends
AppCompatActivity implements Settin
isReadOnlyDoc = (getIntent().getFlags() &
Intent.FLAG_GRANT_WRITE_URI_PERMISSION) == 0;
} else {
// TODO: can't open the file
-Log.e(LOGTAG, "couldn't create temporary file from " +
getIntent().getData());
+Log.e(LOGTAG, "couldn't create temporary file from " +
mDocumentUri);
return;
}
-mbISReadOnlyMode = !isExperimentalMode() || isReadOnlyDoc;
-Log.d(LOGTAG, "SCHEME_CONTENT: getPath(): " +
getIntent().getData().getPath());
+mbISReadOnlyMode = !isExperimentalMode() || isReadOnlyDoc;
+Log.d(LOGTAG, "SCHEME_CONTENT: getPath(): " +
mDocumentUri.getPath());
-String displayName =
FileUtilities.retrieveDisplayNameForDocumentUri(getContentResolver(),
getIntent().getData());
+String displayName =
FileUtilities.retrieveDisplayNameForDocumentUri(getContentResolver(),
mDocumentUri);
if (displayName.isEmpty()) {
// fall back to using temp file name
displayName = mInputFile.getName();
}
toolbarTop.setTitle(displayName);
-} else if
(getIntent().getData().getScheme().equals(ContentResolver.SCHEME_FILE)) {
-mInputFile = new File(getIntent().getData().getPath());
+} else if
(mDocumentUri.getScheme().equals(ContentResolver.SCHEME_FILE)) {
+mInputFile = new File(mDocumentUri.getPath());
mbISReadOnlyMode = true;
-Log.d(LOGTAG, "SCHEME_FILE: getPath(): " +
getIntent().getData().getPath());
+Log.d(LOGTAG, "SCHEME_FILE: getPath(): " +
mDocumentUri.getPath());
toolbarTop.setTitle(mInputFile.getName());
}
} else {
mInputFile = new File(DEFAULT_DOC_PATH);
+mDocumentUri = Uri.fromFile(mInputFile);
+mbISReadOnlyMode = true;
}
mDrawerLayout = findViewById(R.id.drawer_layout);
@@ -304,9 +310,9 @@ public class LibreOfficeMainActivity extends
AppCompatActivity implements Settin
public void run() {
result = false;
try {
-
[Libreoffice-commits] core.git: android/source
android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java | 63
+-
1 file changed, 37 insertions(+), 26 deletions(-)
New commits:
commit 224df2980f0626b1e0b7f40c1434877158fe
Author: Michael Weghorn
AuthorDate: Fri Apr 9 10:00:48 2021 +0200
Commit: Michael Weghorn
CommitDate: Mon Apr 12 07:19:26 2021 +0200
android: Extract method to copy stream
Extract method 'copyStream' used to copy the
temporary file to the actual document URI when
saving.
It will also be used for copying the other way around
when initially opening the document.
Change-Id: I5382f4a7c49b454ff38fb8f95afab3c39145c11f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113879
Tested-by: Jenkins
Reviewed-by: Michael Weghorn
diff --git
a/android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java
b/android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java
index 2a391dab4c8d..2f067b48f90b 100644
--- a/android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java
+++ b/android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java
@@ -44,6 +44,7 @@ import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
+import java.io.InputStream;
import java.io.OutputStream;
import java.nio.ByteBuffer;
import java.nio.channels.Channels;
@@ -368,21 +369,15 @@ public class LibreOfficeMainActivity extends
AppCompatActivity implements Settin
if (isReadOnlyMode() || mInputFile == null || mDocumentUri == null ||
!mDocumentUri.getScheme().equals(ContentResolver.SCHEME_CONTENT))
return;
-FileInputStream inputStream = null;
-OutputStream outputStream = null;
-
+boolean copyOK = false;
try {
-inputStream = new FileInputStream(mInputFile);
-// OutputStream for the actual (original) location
-outputStream = getContentResolver().openOutputStream(mDocumentUri);
-
-byte[] buffer = new byte[4096];
-int readBytes = inputStream.read(buffer);
-while (readBytes != -1) {
-outputStream.write(buffer, 0, readBytes);
-readBytes = inputStream.read(buffer);
-}
-
+final FileInputStream inputStream = new
FileInputStream(mInputFile);
+final OutputStream outputStream =
getContentResolver().openOutputStream(mDocumentUri);
+copyOK = copyStream(inputStream, outputStream);
+} catch (FileNotFoundException e) {
+e.printStackTrace();
+}
+if (copyOK) {
runOnUiThread(new Runnable() {
@Override
public void run() {
@@ -391,7 +386,7 @@ public class LibreOfficeMainActivity extends
AppCompatActivity implements Settin
}
});
setDocumentChanged(false);
-} catch (Exception e) {
+} else {
runOnUiThread(new Runnable() {
@Override
public void run() {
@@ -399,16 +394,6 @@ public class LibreOfficeMainActivity extends
AppCompatActivity implements Settin
Toast.LENGTH_SHORT).show();
}
});
-e.printStackTrace();
-} finally {
-try {
-if (inputStream != null)
-inputStream.close();
-if (outputStream != null)
-outputStream.close();
-} catch (IOException e) {
-e.printStackTrace();
-}
}
}
@@ -946,6 +931,33 @@ public class LibreOfficeMainActivity extends
AppCompatActivity implements Settin
}
}
+/**
+ * Copies everything from the given input stream to the given output stream
+ * and closes both streams in the end.
+ * @return Whether copy operation was successful.
+ */
+private boolean copyStream(InputStream inputStream, OutputStream
outputStream) {
+try {
+byte[] buffer = new byte[4096];
+int readBytes = inputStream.read(buffer);
+while (readBytes != -1) {
+outputStream.write(buffer, 0, readBytes);
+readBytes = inputStream.read(buffer);
+}
+return true;
+} catch (IOException e) {
+e.printStackTrace();
+return false;
+} finally {
+try {
+inputStream.close();
+outputStream.close();
+} catch (IOException e) {
+e.printStackTrace();
+}
+}
+}
+
public void showCustomStatusMessage(String message){
Snackbar.make(mDrawerLayout, message, Snackbar.LENGTH_LONG).show();
}
@@ -990,7 +1002,6 @@ public class LibreOfficeMainActivity extends
AppCompatActivity implements Settin
protected void onSaveInstanceState(Bundle outState) {
[Libreoffice-commits] core.git: android/source
android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java | 10
++
1 file changed, 2 insertions(+), 8 deletions(-)
New commits:
commit bcb74b50920a44729ba2c88db98738a61d8d9920
Author: Michael Weghorn
AuthorDate: Fri Apr 9 10:03:06 2021 +0200
Commit: Michael Weghorn
CommitDate: Mon Apr 12 07:19:50 2021 +0200
android: Drop fallback of opening default doc
Drop the fallback of opening 'example.odt' when
no file to open was given.
I see no valid way how that fallback should be
reached, so write an error log message instead,
just in case there is still a way to get there.
Change-Id: I8b8040ba0099cba9196f65982f09c67791be01c2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113880
Tested-by: Jenkins
Reviewed-by: Michael Weghorn
diff --git
a/android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java
b/android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java
index 2f067b48f90b..022965e65052 100644
--- a/android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java
+++ b/android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java
@@ -60,7 +60,6 @@ import java.util.UUID;
public class LibreOfficeMainActivity extends AppCompatActivity implements
SettingsListenerModel.OnSettingsPreferenceChangedListener {
private static final String LOGTAG = "LibreOfficeMainActivity";
-private static final String DEFAULT_DOC_PATH = "/assets/example.odt";
private static final String ENABLE_EXPERIMENTAL_PREFS_KEY =
"ENABLE_EXPERIMENTAL";
private static final String ASSETS_EXTRACTED_PREFS_KEY =
"ASSETS_EXTRACTED";
private static final String ENABLE_DEVELOPER_PREFS_KEY =
"ENABLE_DEVELOPER";
@@ -211,9 +210,8 @@ public class LibreOfficeMainActivity extends
AppCompatActivity implements Settin
toolbarTop.setTitle(mInputFile.getName());
}
} else {
-mInputFile = new File(DEFAULT_DOC_PATH);
-mDocumentUri = Uri.fromFile(mInputFile);
-mbISReadOnlyMode = true;
+Log.e(LOGTAG, "No document specified. This should never happen.");
+return;
}
mDrawerLayout = findViewById(R.id.drawer_layout);
@@ -356,10 +354,6 @@ public class LibreOfficeMainActivity extends
AppCompatActivity implements Settin
* Save the document.
*/
public void saveDocument() {
-if (!mInputFile.exists()) {
-// Needed for handling null in case new document is not created.
-mInputFile = new File(DEFAULT_DOC_PATH);
-}
Toast.makeText(this, R.string.message_saving,
Toast.LENGTH_SHORT).show();
// local save
LOKitShell.sendEvent(new LOEvent(LOEvent.UNO_COMMAND_NOTIFY,
".uno:Save", true));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: android/.gitignore android/source
android/.gitignore |1
android/source/build.gradle | 26 ++-
android/source/src/java/org/libreoffice/AboutDialogFragment.java | 13 -
android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java | 75
--
4 files changed, 52 insertions(+), 63 deletions(-)
New commits:
commit d3f8f4b1663214ebe29e49e109b1ae704b680b9e
Author: Michael Weghorn
AuthorDate: Fri Apr 9 10:08:19 2021 +0200
Commit: Michael Weghorn
CommitDate: Mon Apr 12 07:20:14 2021 +0200
android: Turn 3 "internal" docs into raw resources
Make 'example.odt', 'license.txt' and 'notice.txt'
(which can be opened via the "About" dialog)
resources of the app by copying them to a new directory
'res_generated' instead of into assets, and include
'res_generated' into resources, then use an
'android.resource://' URI instead of a 'file:///assets/'
one in AboutDialogFragment.
The latter does not work with when passed as a parameter
to 'ContentResolver.openInputStream'.
Adapt/Simplify 'LibreOfficeMainActivity#copyFileToTemp' to
make loading those docs using the 'android.resource://'
URI work and use the existing 'copyStream' method for copying from
the input to the output stream.
This is in preparation for upcoming commit with Change-Id
I7731ef81a4242fa0ce3b3fd8ced1683a6a6bee8c,
"android: Always create a temporary local copy of the doc".
Change-Id: I7731ef81a4242fa0ce3b3fd8ced1683a6a6bee8c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113881
Tested-by: Jenkins
Reviewed-by: Michael Weghorn
diff --git a/android/.gitignore b/android/.gitignore
index 163145dd63fa..de608fea3c14 100644
--- a/android/.gitignore
+++ b/android/.gitignore
@@ -6,6 +6,7 @@
/source/build/
/source/captures/
/source/jni/Application.mk
+/source/res_generated
/jniLibs/
/source/liboSettings.gradle
/source/local.properties
diff --git a/android/source/build.gradle b/android/source/build.gradle
index f6f781b0e407..a690749ff0ee 100644
--- a/android/source/build.gradle
+++ b/android/source/build.gradle
@@ -42,7 +42,7 @@ android {
sourceSets {
main.manifest.srcFile 'AndroidManifest.xml'
main.assets.srcDirs = ['assets']
-main.res.srcDirs = ['res']
+main.res.srcDirs = ['res', 'res_generated']
main.java.srcDirs = ['../Bootstrap/src', 'src/java']
main.jniLibs.srcDirs = ["${liboJniLibsdir}"]
main.jni.srcDirs = [] // don't attempt to build native-lib via gradle
@@ -144,14 +144,6 @@ task copyUnpackAssets(type: Copy) {
task copyAssets(type: Copy) {
description "copies assets that can be accessed within the installed apk"
into 'assets'
-from("${liboInstdir}") {
-includes = ["LICENSE", "NOTICE"]
-rename "LICENSE", "license.txt"
-rename "NOTICE", "notice.txt"
-}
-from("${liboExampleDocument}") {
-rename ".*", "example.odt"
-}
// include icons
into ('share') {
@@ -193,6 +185,19 @@ task copyAssets(type: Copy) {
}
}
+task copyAppResources(type: Copy) {
+description "copies documents to make them available as app resources"
+into 'res_generated/raw'
+from("${liboInstdir}") {
+includes = ["LICENSE", "NOTICE"]
+rename "LICENSE", "license.txt"
+rename "NOTICE", "notice.txt"
+}
+from("${liboExampleDocument}") {
+rename ".*", "example.odt"
+}
+}
+
task createFullConfig(type: Copy) {
// grab dir to clear whole hierarchy on clean target
outputs.dir "assets_fullUI"
@@ -290,7 +295,8 @@ task createRCfiles {
preBuild.dependsOn 'createRCfiles',
'createStrippedConfigMain',
'createStrippedConfigRegistry',
-'createFullConfig'
+'createFullConfig',
+'copyAppResources'
clean.dependsOn 'cleanCopyAssets',
'cleanCreateStrippedConfig',
diff --git a/android/source/src/java/org/libreoffice/AboutDialogFragment.java
b/android/source/src/java/org/libreoffice/AboutDialogFragment.java
index 6c944bae7ef1..8e4ddf0ae08c 100644
--- a/android/source/src/java/org/libreoffice/AboutDialogFragment.java
+++ b/android/source/src/java/org/libreoffice/AboutDialogFragment.java
@@ -30,9 +30,6 @@ import java.io.File;
public class AboutDialogFragment extends DialogFragment {
-private static final String DEFAULT_DOC_PATH = "/assets/example.odt";
-
-
@NonNull @Override
public Dialog onCreateDialog(Bundle savedInstanceState) {
@@ -81,21 +78,21 @@ public class AboutDialogFragment extends DialogFragment {
.setNegativeButton(R.string.about_license, new
DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int id) {
-loadFromAbout("/assets/license.txt");
+loadFromAbout(R.raw.license);
[Libreoffice-commits] core.git: android/source
android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java | 38
--
1 file changed, 18 insertions(+), 20 deletions(-)
New commits:
commit d8fea0b8cc92c3416df1e98d7f472e534eae38e8
Author: Michael Weghorn
AuthorDate: Fri Apr 9 10:08:24 2021 +0200
Commit: Michael Weghorn
CommitDate: Mon Apr 12 07:20:36 2021 +0200
android: Always create a temporary local copy of the doc
Always create a local copy of the original document
to work with, rather than doing a different handling
depending on the type of the URI used to specify the
file to load.
This will also simplify adding support for "Save As"
in upcoming commits, where the temporary
file can remain the same and only the URI for the
actual document will need to be changed.
Change-Id: I2587611fa56b76d8a5384ac25c57335e8d12e987
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113882
Tested-by: Jenkins
Reviewed-by: Michael Weghorn
diff --git
a/android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java
b/android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java
index 0048bad50fd7..950a063e8d94 100644
--- a/android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java
+++ b/android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java
@@ -80,7 +80,6 @@ public class LibreOfficeMainActivity extends
AppCompatActivity implements Settin
private List mDocumentPartView = new
ArrayList();
private DocumentPartViewListAdapter mDocumentPartViewListAdapter;
private int partIndex=-1;
-private File mInputFile;
private DocumentOverlay mDocumentOverlay;
/** URI of the actual document. */
private Uri mDocumentUri;
@@ -183,38 +182,37 @@ public class LibreOfficeMainActivity extends
AppCompatActivity implements Settin
String newDocumentType =
getIntent().getStringExtra(LibreOfficeUIActivity.NEW_DOC_TYPE_KEY);
// create a temporary local file, will be copied to the
actual URI when saving
loadNewDocument(newDocumentType);
-mInputFile = mTempFile;
isReadOnlyDoc = false;
-} else if (copyFileToTemp() && mTempFile != null) {
-mInputFile = mTempFile;
-isReadOnlyDoc = (getIntent().getFlags() &
Intent.FLAG_GRANT_WRITE_URI_PERMISSION) == 0;
} else {
-// TODO: can't open the file
-Log.e(LOGTAG, "couldn't create temporary file from " +
mDocumentUri);
-return;
+isReadOnlyDoc = (getIntent().getFlags() &
Intent.FLAG_GRANT_WRITE_URI_PERMISSION) == 0;
}
mbISReadOnlyMode = !isExperimentalMode() || isReadOnlyDoc;
Log.d(LOGTAG, "SCHEME_CONTENT: getPath(): " +
mDocumentUri.getPath());
String displayName =
FileUtilities.retrieveDisplayNameForDocumentUri(getContentResolver(),
mDocumentUri);
-if (displayName.isEmpty()) {
-// fall back to using temp file name
-displayName = mInputFile.getName();
-}
toolbarTop.setTitle(displayName);
} else if
(mDocumentUri.getScheme().equals(ContentResolver.SCHEME_FILE)) {
-mInputFile = new File(mDocumentUri.getPath());
mbISReadOnlyMode = true;
Log.d(LOGTAG, "SCHEME_FILE: getPath(): " +
mDocumentUri.getPath());
-toolbarTop.setTitle(mInputFile.getName());
+toolbarTop.setTitle(mDocumentUri.getLastPathSegment());
}
} else {
Log.e(LOGTAG, "No document specified. This should never happen.");
return;
}
+if (!isNewDocument) {
+// create a temporary local copy to work with
+boolean copyOK = copyFileToTemp() && mTempFile != null;
+if (!copyOK) {
+// TODO: can't open the file
+Log.e(LOGTAG, "couldn't create temporary file from " +
mDocumentUri);
+return;
+}
+}
+
mDrawerLayout = findViewById(R.id.drawer_layout);
if (mDocumentPartViewListAdapter == null) {
@@ -345,12 +343,12 @@ public class LibreOfficeMainActivity extends
AppCompatActivity implements Settin
}
public void saveFileToOriginalSource() {
-if (isReadOnlyMode() || mInputFile == null || mDocumentUri == null ||
!mDocumentUri.getScheme().equals(ContentResolver.SCHEME_CONTENT))
+if (isReadOnlyMode() || mTempFile == null || mDocumentUri == null ||
!mDocumentUri.getScheme().equals(ContentResolver.SCHEME_CONTENT))
return;
boolean copyOK = false;
try {
-final FileInputStream inputStream = new
FileInputStream(mInputFile);
+final FileInputStream inputStream = new FileInputSt
[Libreoffice-commits] core.git: android/source
android/source/src/java/org/libreoffice/LOEvent.java |8 -
android/source/src/java/org/libreoffice/LOKitShell.java |4
android/source/src/java/org/libreoffice/LOKitThread.java | 23
android/source/src/java/org/libreoffice/LOKitTileProvider.java | 54
--
android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java | 21 ---
5 files changed, 7 insertions(+), 103 deletions(-)
New commits:
commit 1bc42472200c32c9a0a10dd1c3cd6c6a8a5d47d2
Author: Michael Weghorn
AuthorDate: Fri Apr 9 13:59:43 2021 +0200
Commit: Michael Weghorn
CommitDate: Mon Apr 12 07:20:58 2021 +0200
tdf#95517 android: Rework app/doc lifecycle handling
Previously, the document was always closed in
LibreOfficeMainActivity's 'onStop' and loaded anew in
its 'onStart' method.
In order to not lose user changes, there was also
a caching mechanism in LOKitTileProvider, also triggered
in 'LibreOfficeMainActivity#onStop'.
This means that e.g. each time a switch to another
Activity/app happened, a cache document with the user
modifications in it should have been created for
restoration. That did not really seem to work
particularly well in a few tests, as also described
in tdf#95517 ("changes reset after show Settings").
The documentation aboue Activity lifecycle says [1]
> The entire lifetime of an activity happens between the first call to
> onCreate(Bundle) through to a single final call to onDestroy(). An
> activity will do all setup of "global" state in onCreate(), and release
> all remaining resources in onDestroy(). For example, if it has a thread
> running in the background to download data from the network, it may
> create that thread in onCreate() and then stop the thread in
> onDestroy().
This changes the handling to load the document in the
'onCreate' method and clos it only in 'onDestroy',
i.e. the document remains open while e.g. switching
to another Activity or app, thus making it unnecessary
to try to restore state as good as possible in 'onStart'.
An invalidation of the view (via 'LOEvent.REFRESH')
generally seems to be enough.
(Well, sometimes there is an issue with
invalidation/repaint and single tiles remain black,
but that happened previously - when the whole doc
was loaded anew - just the same way).
This allows dropping some extra handling needed
to try to restore the previous state, along with the
caching mechanism in LOKitTileProvider (that had some
other issues, e.g. it didn't reliably create the cache
file, since the file extension was not always set, and
'LOKitTileProvider#cacheDocument' was relying on that
to derive the document type).
I am not sure whether I missed any aspect that the
previous implementation was trying to solve, but
at least these scenarios I found and tested worked
as expected with the change in place:
* user changes still present after switching between apps
(s. tdf#106648 "Android: save current work when onSaveInstanceState is
called")
* for the Calc case, the sheet that was selected before
switching apps is still selected (s. tdf#101689
"Android Viewer calc returns to first sheet")
* user changes no longer get lost when selecting a menu item
(s. tdf#95517 "changes reset after show Settings")
* case where the user leaves the app by pressing Home, and starts it again
(as described in commit 83386129f5be002f2649db81bba4c468c7f6e4de
"android: Fix the application lifecycle.")
[1]
https://developer.android.com/reference/android/app/Activity#activity-lifecycle
Change-Id: If59734cbfd62673884786066c94e2c2a1d6a916e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113883
Tested-by: Jenkins
Reviewed-by: Michael Weghorn
diff --git a/android/source/src/java/org/libreoffice/LOEvent.java
b/android/source/src/java/org/libreoffice/LOEvent.java
index 74a09c92cc1d..d1170eee12ad 100644
--- a/android/source/src/java/org/libreoffice/LOEvent.java
+++ b/android/source/src/java/org/libreoffice/LOEvent.java
@@ -33,7 +33,6 @@ public class LOEvent implements Comparable {
public static final int SWIPE_LEFT = 12;
public static final int NAVIGATION_CLICK = 13;
public static final int UNO_COMMAND = 14;
-public static final int RESUME = 15;
public static final int LOAD_NEW = 16;
public static final int SAVE_AS = 17;
public static final int UPDATE_PART_PAGE_RECT = 18;
@@ -105,13 +104,6 @@ public class LOEvent implements Comparable {
mValue = value;
}
-public LOEvent(int type, String key, int value) {
-mType = type;
-mTypeString = "Resume partIndex";
-mString = key;
-mPartIndex = value;
-}
-
public LOEvent(String filePath, int type) {
mTy
[Libreoffice-commits] core.git: android/source
android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java |5
-
1 file changed, 5 deletions(-)
New commits:
commit c0c43f4742e9a78addafd9522779f7f55243a522
Author: Michael Weghorn
AuthorDate: Fri Apr 9 16:50:06 2021 +0200
Commit: Michael Weghorn
CommitDate: Mon Apr 12 07:21:26 2021 +0200
android: Drop 'LibreOfficeMainActivity#onSaveInstanceState'
It just calls the parent class method anyway.
Change-Id: I802e75ad650b71d6daa08494ff812985bb844a5f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113884
Tested-by: Jenkins
Reviewed-by: Michael Weghorn
diff --git
a/android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java
b/android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java
index a1fab7dbde49..f751f2e7dd61 100644
--- a/android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java
+++ b/android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java
@@ -963,11 +963,6 @@ public class LibreOfficeMainActivity extends
AppCompatActivity implements Settin
mFormattingController.handleActivityResult(requestCode, resultCode,
data);
hideBottomToolbar();
}
-
-@Override
-protected void onSaveInstanceState(Bundle outState) {
-super.onSaveInstanceState(outState);
-}
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: android/source
android/source/res/values-tr/strings.xml |9 - 1 file changed, 9 deletions(-) New commits: commit bcf0ed2f672646107b42cbe67e5c3c9d170bb33a Author: Michael Weghorn AuthorDate: Fri Apr 9 17:04:15 2021 +0200 Commit: Michael Weghorn CommitDate: Mon Apr 12 07:21:48 2021 +0200 android: Drop some unused Turkish translations Those are leftovers; they're unused since commit a23bd42e9b2f6401c710ac95afcc3aa8f360d65c Date: Tue Apr 6 14:26:06 2021 +0200 android: Drop custom file abstraction + UI Change-Id: I898391cfccd465e4d18d51ee07ee847978872ef1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113885 Tested-by: Jenkins Reviewed-by: Michael Weghorn diff --git a/android/source/res/values-tr/strings.xml b/android/source/res/values-tr/strings.xml index fe2ee5958dcc..72d15c210933 100644 --- a/android/source/res/values-tr/strings.xml +++ b/android/source/res/values-tr/strings.xml @@ -58,15 +58,6 @@ Geri Al Yinele - -Üst dizin -Onayla -İptal -Git -Dizin Seç -Geçersiz dizin -Şuan ki dizin: %1$s - Değişiklikleri kaydetmek istiyor musunuz? Kaydet ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-7-1+backports' - 10 commits - android/.gitignore android/source
android/.gitignore|1
android/source/build.gradle | 26 -
android/source/res/values-tr/strings.xml |9
android/source/src/java/org/libreoffice/AboutDialogFragment.java | 13
android/source/src/java/org/libreoffice/LOEvent.java |8
android/source/src/java/org/libreoffice/LOKitShell.java |4
android/source/src/java/org/libreoffice/LOKitThread.java | 23 -
android/source/src/java/org/libreoffice/LOKitTileProvider.java| 54 --
android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java | 221
--
android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java | 20
10 files changed, 142 insertions(+), 237 deletions(-)
New commits:
commit fba9d44884f48e8564b78246cbe44dc61a2b284b
Author: Michael Weghorn
AuthorDate: Fri Apr 9 17:04:15 2021 +0200
Commit: Michael Weghorn
CommitDate: Mon Apr 12 07:35:15 2021 +0200
android: Drop some unused Turkish translations
Those are leftovers; they're unused since
commit a23bd42e9b2f6401c710ac95afcc3aa8f360d65c
Date: Tue Apr 6 14:26:06 2021 +0200
android: Drop custom file abstraction + UI
Change-Id: I898391cfccd465e4d18d51ee07ee847978872ef1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113885
Tested-by: Jenkins
Reviewed-by: Michael Weghorn
(cherry picked from commit bcf0ed2f672646107b42cbe67e5c3c9d170bb33a)
diff --git a/android/source/res/values-tr/strings.xml
b/android/source/res/values-tr/strings.xml
index fe2ee5958dcc..72d15c210933 100644
--- a/android/source/res/values-tr/strings.xml
+++ b/android/source/res/values-tr/strings.xml
@@ -58,15 +58,6 @@
Geri Al
Yinele
-
-Üst dizin
-Onayla
-İptal
-Git
-Dizin Seç
-Geçersiz dizin
-Şuan ki dizin: %1$s
-
Değişiklikleri kaydetmek istiyor
musunuz?
Kaydet
commit f0b3f7321c8bef595ed3555a594d75901ce58802
Author: Michael Weghorn
AuthorDate: Fri Apr 9 16:50:06 2021 +0200
Commit: Michael Weghorn
CommitDate: Mon Apr 12 07:35:08 2021 +0200
android: Drop 'LibreOfficeMainActivity#onSaveInstanceState'
It just calls the parent class method anyway.
Change-Id: I802e75ad650b71d6daa08494ff812985bb844a5f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113884
Tested-by: Jenkins
Reviewed-by: Michael Weghorn
(cherry picked from commit c0c43f4742e9a78addafd9522779f7f55243a522)
diff --git
a/android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java
b/android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java
index a1fab7dbde49..f751f2e7dd61 100644
--- a/android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java
+++ b/android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java
@@ -963,11 +963,6 @@ public class LibreOfficeMainActivity extends
AppCompatActivity implements Settin
mFormattingController.handleActivityResult(requestCode, resultCode,
data);
hideBottomToolbar();
}
-
-@Override
-protected void onSaveInstanceState(Bundle outState) {
-super.onSaveInstanceState(outState);
-}
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 5b83ba53dcdc8c92691685a318f1e5929ae67995
Author: Michael Weghorn
AuthorDate: Fri Apr 9 13:59:43 2021 +0200
Commit: Michael Weghorn
CommitDate: Mon Apr 12 07:34:57 2021 +0200
tdf#95517 android: Rework app/doc lifecycle handling
Previously, the document was always closed in
LibreOfficeMainActivity's 'onStop' and loaded anew in
its 'onStart' method.
In order to not lose user changes, there was also
a caching mechanism in LOKitTileProvider, also triggered
in 'LibreOfficeMainActivity#onStop'.
This means that e.g. each time a switch to another
Activity/app happened, a cache document with the user
modifications in it should have been created for
restoration. That did not really seem to work
particularly well in a few tests, as also described
in tdf#95517 ("changes reset after show Settings").
The documentation aboue Activity lifecycle says [1]
> The entire lifetime of an activity happens between the first call to
> onCreate(Bundle) through to a single final call to onDestroy(). An
> activity will do all setup of "global" state in onCreate(), and release
> all remaining resources in onDestroy(). For example, if it has a thread
> running in the background to download data from the network, it may
> create that thread in onCreate() and then stop the thread in
> onDestroy().
This changes the handling to load the document in the
'onCreate' method and clos it only in 'onDestroy',
i.e. the document remains open while e.g. switching
to another Activity or app, thus makin
[Libreoffice-commits] core.git: sal/rtl
sal/rtl/strtmpl.hxx | 209 ++--
1 file changed, 25 insertions(+), 184 deletions(-)
New commits:
commit 334838efc12cd1e4a451a8dd7542b93fdaf30bb9
Author: Mike Kaganski
AuthorDate: Sun Apr 11 08:46:44 2021 +0300
Commit: Mike Kaganski
CommitDate: Mon Apr 12 08:00:30 2021 +0200
Unify on std::basic_string_view for indexOfStr
A follow-up for 5ebccaa07589383653dbd65e58204a82dd3cde09 and
5a11edc795d8a3ef1e15fc4e251f594911403131
Change-Id: I58c1f518967cb98bd7edecd655d5be0d4657a1ee
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113938
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
diff --git a/sal/rtl/strtmpl.hxx b/sal/rtl/strtmpl.hxx
index d0f853f62feb..bdff4bb44647 100644
--- a/sal/rtl/strtmpl.hxx
+++ b/sal/rtl/strtmpl.hxx
@@ -392,33 +392,13 @@ sal_Int32 indexOfChar_WithLength
( const IMPL_RTL_ST
IMPL_RTL_STRCODE c )
{
//assert(nLen >= 0);
-if constexpr (sizeof(IMPL_RTL_STRCODE) == sizeof(char))
-{
-// take advantage of builtin optimisations
-IMPL_RTL_STRCODE* p =
static_cast(std::memchr(const_cast(pStr), c, nLen));
-return p ? p - pStr : -1;
-}
-else if constexpr (sizeof(IMPL_RTL_STRCODE) == sizeof(char16_t))
-{
-// take advantage of builtin optimisations
-if (nLen <= 0) // char_traits::find takes an unsigned length
-return -1;
-char16_t const * p = std::char_traits::find(pStr, nLen, c);
-return p ? p - pStr : -1;
-}
-else
-{
-const IMPL_RTL_STRCODE* pTempStr = pStr;
-while ( nLen > 0 )
-{
-if ( *pTempStr == c )
-return pTempStr-pStr;
-
-pTempStr++;
-nLen--;
-}
+if (nLen <= 0)
return -1;
-}
+// take advantage of builtin optimisations
+using my_string_view = std::basic_string_view;
+my_string_view v(pStr, nLen);
+typename my_string_view::size_type idx = v.find(c);
+return idx == my_string_view::npos ? -1 : idx;
}
/* --- */
@@ -457,33 +437,11 @@ sal_Int32 lastIndexOfChar_WithLength
( const IMPL_RT
IMPL_RTL_STRCODE c )
{
assert(nLen >= 0);
-if constexpr (sizeof(IMPL_RTL_STRCODE) == sizeof(char))
-{
-// take advantage of builtin optimisations
-std::string_view v(pStr, nLen);
-std::string_view::size_type idx = v.rfind(c);
-return idx == std::string_view::npos ? -1 : idx;
-}
-else if constexpr (sizeof(IMPL_RTL_STRCODE) == sizeof(char16_t))
-{
-// take advantage of builtin optimisations
-std::u16string_view v(pStr, nLen);
-std::u16string_view::size_type idx = v.rfind(c);
-return idx == std::string_view::npos ? -1 : idx;
-}
-else
-{
-pStr += nLen;
-while ( nLen > 0 )
-{
-nLen--;
-pStr--;
-
-if ( *pStr == c )
-return nLen;
-}
-return -1;
-}
+// take advantage of builtin optimisations
+using my_string_view = std::basic_string_view;
+my_string_view v(pStr, nLen);
+typename my_string_view::size_type idx = v.rfind(c);
+return idx == my_string_view::npos ? -1 : idx;
}
/* --- */
@@ -529,75 +487,13 @@ sal_Int32 indexOfStr_WithLength
( const IMPL_RTL_STR
assert(nSubLen >= 0);
/* an empty SubString is always not findable */
if ( nSubLen == 0 )
-;
-else if constexpr (sizeof(IMPL_RTL_STRCODE) == sizeof(char))
-{
-// take advantage of builtin optimisations
-std::string_view v(pStr, nStrLen);
-std::string_view needle(pSubStr, nSubLen);
-std::string_view::size_type idx = v.find(needle);
-return idx == std::string_view::npos ? -1 : idx;
-}
-else if constexpr (sizeof(IMPL_RTL_STRCODE) == sizeof(char16_t))
-{
-// take advantage of builtin optimisations
-std::u16string_view v(pStr, nStrLen);
-std::u16string_view needle(pSubStr, nSubLen);
-std::u16string_view::size_type idx = v.find(needle);
-return idx == std::string_view::npos ? -1 : idx;
-}
-else
-{
-/* faster search for a single character */
-if ( nSubLen == 1 )
-{
-IMPL_RTL_STRCODEc = *pSubStr;
-const IMPL_RTL_STRCODE* pTempStr = pStr;
-while ( nStrLen > 0 )
-{
-if ( *pTempStr == c )
-return pTempStr-pStr;
-
-pTempStr++;
-nStrLen--;
-}
-}
-else
-{
-const IMPL_RT
[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - vcl/qt5
vcl/qt5/Qt5Frame.cxx |8
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 3f204ca2fed7614e1e12180af5ce5bfd88249eb7
Author: Jan-Marek Glogowski
AuthorDate: Sun Apr 11 17:21:57 2021 +0200
Commit: Michael Weghorn
CommitDate: Mon Apr 12 08:09:18 2021 +0200
tdf#141623 Qt5+cairo init surface with widget size
The QFont based rendering path directly uses the widgets size to
initialize the QImage buffer image, so do the same for the Cairo
surface, instead of the arbitrarily size of 640x480.
Change-Id: I91326dab67cbbb5e75b78b02c34eaca61ad26482
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113955
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski
(cherry picked from commit 91c883e75436210ca8af95df1ca597caeeda8703)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113869
Reviewed-by: Michael Weghorn
diff --git a/vcl/qt5/Qt5Frame.cxx b/vcl/qt5/Qt5Frame.cxx
index cbe31b8b5409..b398e9a5cf3b 100644
--- a/vcl/qt5/Qt5Frame.cxx
+++ b/vcl/qt5/Qt5Frame.cxx
@@ -290,11 +290,11 @@ void Qt5Frame::Damage(sal_Int32 nExtentsX, sal_Int32
nExtentsY, sal_Int32 nExten
void Qt5Frame::InitQt5SvpGraphics(Qt5SvpGraphics* pQt5SvpGraphics)
{
-int width = 640;
-int height = 480;
+QSize aSize = m_pQWidget->size() * devicePixelRatioF();
m_pSvpGraphics = pQt5SvpGraphics;
-m_pSurface.reset(cairo_image_surface_create(CAIRO_FORMAT_ARGB32, width,
height));
-m_pSvpGraphics->setSurface(m_pSurface.get(), basegfx::B2IVector(width,
height));
+m_pSurface.reset(
+cairo_image_surface_create(CAIRO_FORMAT_ARGB32, aSize.width(),
aSize.height()));
+m_pSvpGraphics->setSurface(m_pSurface.get(),
basegfx::B2IVector(aSize.width(), aSize.height()));
cairo_surface_set_user_data(m_pSurface.get(),
Qt5SvpGraphics::getDamageKey(), &m_aDamageHandler,
nullptr);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/sfx2 sfx2/source sfx2/uiconfig
include/sfx2/dinfdlg.hxx |2
sfx2/source/dialog/dinfdlg.cxx | 12 -
sfx2/uiconfig/ui/documentinfopage.ui | 283 +--
3 files changed, 149 insertions(+), 148 deletions(-)
New commits:
commit dc78803e2fc757fc3ddd97b59e698bf1385c
Author: Heiko Tietze
AuthorDate: Fri Apr 9 11:25:54 2021 +0200
Commit: Heiko Tietze
CommitDate: Mon Apr 12 08:24:45 2021 +0200
Resolves tdf#135896 - Add hyperlink to file location
File > Properties: Document Location is now a hyperlink
opening the file browser for local files or the internet
browser for remote content
Change-Id: If3de16172e12aa1a3f4acc7504a2b3dd78677c09
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113839
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx
index 04fe4131216b..6f332f7112e0 100644
--- a/include/sfx2/dinfdlg.hxx
+++ b/include/sfx2/dinfdlg.hxx
@@ -167,7 +167,7 @@ private:
std::unique_ptr m_xChangePassBtn;
std::unique_ptr m_xShowTypeFT;
-std::unique_ptr m_xFileValEd;
+std::unique_ptr m_xFileValEd;
std::unique_ptr m_xShowSizeFT;
std::unique_ptr m_xCreateValFt;
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index c08c0dfa5cd8..ca5897df8a0a 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -689,7 +689,7 @@ SfxDocumentPage::SfxDocumentPage(weld::Container* pPage,
weld::DialogController*
, m_xNameED(m_xBuilder->weld_label("nameed"))
, m_xChangePassBtn(m_xBuilder->weld_button("changepass"))
, m_xShowTypeFT(m_xBuilder->weld_label("showtype"))
-, m_xFileValEd(m_xBuilder->weld_label("showlocation"))
+, m_xFileValEd(m_xBuilder->weld_link_button("showlocation"))
, m_xShowSizeFT(m_xBuilder->weld_label("showsize"))
, m_xCreateValFt(m_xBuilder->weld_label("showcreate"))
, m_xChangeValFt(m_xBuilder->weld_label("showmodify"))
@@ -974,10 +974,14 @@ void SfxDocumentPage::Reset( const SfxItemSet* rSet )
// we know it's a folder -> don't need the final slash, but it's
better for WB_PATHELLIPSIS
aPath.removeFinalSlash();
OUString aText( aPath.PathToFileName() ); //! (pb) MaxLen?
-m_xFileValEd->set_label( aText );
+m_xFileValEd->set_label(aText);
+m_xFileValEd->set_uri("file://" + aText);
+}
+else if (aURL.GetProtocol() != INetProtocol::PrivSoffice)
+{
+m_xFileValEd->set_label(aURL.GetPartBeforeLastName());
+m_xFileValEd->set_uri(m_xFileValEd->get_label());
}
-else if ( aURL.GetProtocol() != INetProtocol::PrivSoffice )
-m_xFileValEd->set_label( aURL.GetPartBeforeLastName() );
// handle access data
bool bUseUserData = rInfoItem.IsUseUserData();
diff --git a/sfx2/uiconfig/ui/documentinfopage.ui
b/sfx2/uiconfig/ui/documentinfopage.ui
index 7fd64c4df456..49a4f8ab1c07 100644
--- a/sfx2/uiconfig/ui/documentinfopage.ui
+++ b/sfx2/uiconfig/ui/documentinfopage.ui
@@ -1,191 +1,191 @@
-
+
-
+
True
-False
+False
True
True
-12
-6
-12
+12
+6
+12
True
-False
+False
end
_Created:
-True
-showcreate
+True
+showcreate
-0
-4
+0
+4
True
-False
+False
end
_Modified:
-True
-showmodify
+True
+showmodify
-0
-5
+0
+5
True
-False
+False
end
_Digitally signed:
-True
-showsigned
+True
+showsigned
-0
-7
+0
+7
True
-False
+False
end
Last pri_nted:
-True
-showprint
+True
+showprint
-0
-8
+0
+8
True
-False
+False
end
Total _editing time:
-True
-showedittime
+True
+showedittime
-0
-9
+0
+9
True
-False
+False
end
Re_vision number:
-True
-showrevision
+True
+showrevision
-0
-10
+0
+10
True
-False
+False
True
True
0
-1
-4
+1
+4
2
True
-False
+False
True
True
0
-1
-5
+1
+5
2
[Libreoffice-commits] core.git: cui/inc
cui/inc/tipoftheday.hrc |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit f1a20dc89296ccdf15cabdd50af5e31a9659cdc6
Author: Ming Hua
AuthorDate: Sat Apr 10 13:09:48 2021 +0800
Commit: Heiko Tietze
CommitDate: Mon Apr 12 08:26:43 2021 +0200
Tip-of-the-day: improve a tip and add link (related to tdf#139533)
This was changed in
commit a182dea0413c467b834f206f9cb91dc3f56acd35
tdf#139533 re-word a tip of the day
and "You can" was added to the beginning of all sentences that start
with "Create...". However this particular one is phrased as a question,
and "You can create...?" is obviously grammatically incorrect.
Fix this by combining the two sentences of the tip into one, and drop
the unnecessary and inaccurate note in parentheses.
Also add a link to the help page about creating master document.
Change-Id: Ib6e92b2a7772378e4b7b67e40bdd2e2791d4f07a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113392
Tested-by: Jenkins
Reviewed-by: Seth Chaiklin
diff --git a/cui/inc/tipoftheday.hrc b/cui/inc/tipoftheday.hrc
index 401ff2c4907a..d2828a62d5ab 100644
--- a/cui/inc/tipoftheday.hrc
+++ b/cui/inc/tipoftheday.hrc
@@ -237,7 +237,7 @@ const std::tuple
TIPOFTHEDAY_STRINGARRAY[] =
{ NC_("RID_CUI_TIPOFTHEDAY", "In Calc use TRIMMEAN() to return the mean
of a data set excluding the highest and lowest values."),
"https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/scalc/01/04060182.html?DbPAR=CALC#bm_id3152966";,
"tipoftheday_c.png"}, //local help missing
{ NC_("RID_CUI_TIPOFTHEDAY", "The 4th optional parameter of VLOOKUP Calc
function indicates whether the first column of data is sorted. If not, enter
FALSE or zero."), "", "tipoftheday_c.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Toolbars are contextual—they open depending
on the context. If you do not want that, uncheck them from View ▸ Toolbars."),
"", ""},
- { NC_("RID_CUI_TIPOFTHEDAY", "You can create a master document from the
current Writer document? File ▸ Send ▸ Create Master Document (sub-documents
are created depending of outline)."), "", "tipoftheday_w.png"},
+ { NC_("RID_CUI_TIPOFTHEDAY", "You can create a master document from the
current Writer document by using File ▸ Send ▸ Create Master Document."),
"SW_HID_SEND_MASTER_CTRL_PUSHBUTTON_CANCEL", "tipoftheday_w.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Want to center cells on a printed page in
Calc? Format ▸ Page, Page ▸ Layout settings ▸ Table alignment."), "",
"tipoftheday_c.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Frames can be linked so that the text can
flow from one to the other as in desktop publishing."),
"https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/swriter/guide/text_frame.html";,
"tipoftheday_w.png"}, //local help missing
{ NC_("RID_CUI_TIPOFTHEDAY", "You can create a chart based on a Writer
table by clicking in the table and choosing Insert ▸ Chart."), "",
"tipoftheday_w.png"},
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/core/data/segmenttree.cxx | 107 ++--
1 file changed, 80 insertions(+), 27 deletions(-)
New commits:
commit f9fae84cbd9663d6a394aa8e4e4b927c11384815
Author: Noel Grandin
AuthorDate: Sun Apr 11 14:52:06 2021 +0200
Commit: Noel Grandin
CommitDate: Mon Apr 12 08:27:06 2021 +0200
tdf#130326 speed up XLSX load in ScFlatSegmentsImpl
since we are iterating over the tree, use an iterator to speed
up subsequent lookups.
Takes my load time from 26.2s to 24.3s
Change-Id: Iac86c9f60d447cb7679913a0585c9631f845c3e4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113948
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sc/source/core/data/segmenttree.cxx
b/sc/source/core/data/segmenttree.cxx
index d73d233d894c..3233a074ac06 100644
--- a/sc/source/core/data/segmenttree.cxx
+++ b/sc/source/core/data/segmenttree.cxx
@@ -146,41 +146,93 @@ template
typename ScFlatSegmentsImpl::ExtValueType
ScFlatSegmentsImpl::getSumValue(SCCOLROW nPos1,
SCCOLROW nPos2)
{
-RangeData aData;
-if (!getRangeData(nPos1, aData))
-return 0;
-
-sal_uInt32 nValue = 0;
-
-SCROW nCurPos = nPos1;
-SCROW nEndPos = aData.mnPos2;
-while (nEndPos <= nPos2)
+if (mbTreeSearchEnabled)
{
-sal_uInt32 nRes;
-if (o3tl::checked_multiply(aData.mnValue, nEndPos -
nCurPos + 1, nRes))
+
+if (!maSegments.is_tree_valid())
{
-SAL_WARN("sc.core", "row height overflow");
-nRes = SAL_MAX_INT32;
+assert(!ScGlobal::bThreadedGroupCalcInProgress);
+maSegments.build_tree();
}
-nValue = o3tl::saturating_add(nValue, nRes);
-nCurPos = nEndPos + 1;
-if (!getRangeData(nCurPos, aData))
-break;
-nEndPos = aData.mnPos2;
+RangeData aData;
+auto [it, found] = maSegments.search_tree(nPos1, aData.mnValue,
&aData.mnPos1, &aData.mnPos2);
+if (!found)
+return 0;
+aData.mnPos2 = aData.mnPos2-1; // end point is not inclusive.
+
+sal_uInt32 nValue = 0;
+
+SCROW nCurPos = nPos1;
+SCROW nEndPos = aData.mnPos2;
+while (nEndPos <= nPos2)
+{
+sal_uInt32 nRes;
+if (o3tl::checked_multiply(aData.mnValue, nEndPos -
nCurPos + 1, nRes))
+{
+SAL_WARN("sc.core", "row height overflow");
+nRes = SAL_MAX_INT32;
+}
+nValue = o3tl::saturating_add(nValue, nRes);
+nCurPos = nEndPos + 1;
+auto itPair = maSegments.search(it, nCurPos, aData.mnValue,
&aData.mnPos1, &aData.mnPos2);
+if (!itPair.second)
+break;
+it = itPair.first;
+aData.mnPos2 = aData.mnPos2-1; // end point is not inclusive.
+nEndPos = aData.mnPos2;
+}
+if (nCurPos <= nPos2)
+{
+nEndPos = ::std::min(nEndPos, nPos2);
+sal_uInt32 nRes;
+if (o3tl::checked_multiply(aData.mnValue, nEndPos -
nCurPos + 1, nRes))
+{
+SAL_WARN("sc.core", "row height overflow");
+nRes = SAL_MAX_INT32;
+}
+nValue = o3tl::saturating_add(nValue, nRes);
+}
+return nValue;
}
-if (nCurPos <= nPos2)
+else
{
-nEndPos = ::std::min(nEndPos, nPos2);
-sal_uInt32 nRes;
-if (o3tl::checked_multiply(aData.mnValue, nEndPos -
nCurPos + 1, nRes))
+RangeData aData;
+if (!getRangeDataLeaf(nPos1, aData))
+return 0;
+
+sal_uInt32 nValue = 0;
+
+SCROW nCurPos = nPos1;
+SCROW nEndPos = aData.mnPos2;
+while (nEndPos <= nPos2)
{
-SAL_WARN("sc.core", "row height overflow");
-nRes = SAL_MAX_INT32;
+sal_uInt32 nRes;
+if (o3tl::checked_multiply(aData.mnValue, nEndPos -
nCurPos + 1, nRes))
+{
+SAL_WARN("sc.core", "row height overflow");
+nRes = SAL_MAX_INT32;
+}
+nValue = o3tl::saturating_add(nValue, nRes);
+nCurPos = nEndPos + 1;
+if (!getRangeDataLeaf(nCurPos, aData))
+break;
+
+nEndPos = aData.mnPos2;
}
-nValue = o3tl::saturating_add(nValue, nRes);
+if (nCurPos <= nPos2)
+{
+nEndPos = ::std::min(nEndPos, nPos2);
+sal_uInt32 nRes;
+if (o3tl::checked_multiply(aData.mnValue, nEndPos -
nCurPos + 1, nRes))
+{
+SAL_WARN("sc.core", "row height overflow");
+nRes = SAL_MAX_INT32;
+}
+nValue = o3tl::saturating_add(nValue, nRes);
+}
+return nValue;
}
-return nValue;
}
template
@@ -195,7 +247,8 @@ bool ScFlatSegmentsImpl::getRangeData(SCCOLROW nPos,
maSegments.build_tree();
Po-Yen Huang license statement
All of my past & future contributions to LibreOffice may be licensed under the MPLv2/LGPLv3+ dual license. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/qa sc/source vcl/source
sc/qa/uitest/range_name/tdf86214.py | 10 ++
sc/source/ui/namedlg/namedefdlg.cxx | 34 +++---
vcl/source/uitest/uiobject.cxx |1 +
3 files changed, 22 insertions(+), 23 deletions(-)
New commits:
commit 58dcf2a88af215df4e912f0cfcb32908c6a298a0
Author: Andreas Heinisch
AuthorDate: Fri Apr 2 13:23:46 2021 +0200
Commit: Heiko Tietze
CommitDate: Mon Apr 12 08:39:47 2021 +0200
tdf#132869 - Show the error message in a tooltip
In the define name dialog, the input itself should show the error
message in a tooltip. In addition, the possibility to test the tooltip
text in python was added.
Change-Id: I9bd7d2b2be8300aa366971f8a1f115e8ae19fb98
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113513
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
diff --git a/sc/qa/uitest/range_name/tdf86214.py
b/sc/qa/uitest/range_name/tdf86214.py
index d529a47b9dd1..48817e0bcc64 100644
--- a/sc/qa/uitest/range_name/tdf86214.py
+++ b/sc/qa/uitest/range_name/tdf86214.py
@@ -39,16 +39,18 @@ class InvalidNames(UITestCase):
select_all(xEdit)
type_text(xEdit, name)
-new_text = get_state_as_dict(xLabel)["Text"]
-self.assertNotEqual(success_text, new_text)
+# tdf#132869 - Without the fix in place, this test would have
failed with
+# - Expected: "Invalid name. Start with a letter, use only
letters, numbers and underscore."
+# - Actual : ""
+self.assertNotEqual(success_text,
get_state_as_dict(xEdit)["QuickHelpText"])
self.assertEqual(get_state_as_dict(xAddBtn)["Enabled"],
"false")
select_all(xEdit)
type_text(xEdit, "valid_name")
-new_text = get_state_as_dict(xLabel)["Text"]
-self.assertEqual(success_text, new_text)
+self.assertEqual(success_text, get_state_as_dict(xLabel)["Text"])
+self.assertEqual(success_text,
get_state_as_dict(xEdit)["QuickHelpText"])
self.assertEqual(get_state_as_dict(xAddBtn)["Enabled"], "true")
self.ui_test.close_dialog_through_button(xAddBtn)
diff --git a/sc/source/ui/namedlg/namedefdlg.cxx
b/sc/source/ui/namedlg/namedefdlg.cxx
index 25ff6e132a61..658026652c6b 100644
--- a/sc/source/ui/namedlg/namedefdlg.cxx
+++ b/sc/source/ui/namedlg/namedefdlg.cxx
@@ -120,6 +120,9 @@ bool ScNameDefDlg::IsNameValid()
OUString aScope = m_xLbScope->get_active_text();
OUString aName = m_xEdName->get_text();
+bool bIsNameValid = true;
+OUString aHelpText = maStrInfoDefault;
+
ScRangeName* pRangeName = nullptr;
if(aScope == maGlobalNameStr)
{
@@ -131,46 +134,39 @@ bool ScNameDefDlg::IsNameValid()
}
ScRangeData::IsNameValidType eType;
-m_xFtInfo->set_label_type(weld::LabelType::Normal);
if ( aName.isEmpty() )
{
-m_xBtnAdd->set_sensitive(false);
-m_xFtInfo->set_label(maStrInfoDefault);
-return false;
+bIsNameValid = false;
}
else if ((eType = ScRangeData::IsNameValid(aName, mrDoc))
!= ScRangeData::IsNameValidType::NAME_VALID)
{
-m_xFtInfo->set_label_type(weld::LabelType::Error);
if (eType == ScRangeData::IsNameValidType::NAME_INVALID_BAD_STRING)
{
-m_xFtInfo->set_label(maErrInvalidNameStr);
+aHelpText = maErrInvalidNameStr;
}
else if (eType == ScRangeData::IsNameValidType::NAME_INVALID_CELL_REF)
{
-m_xFtInfo->set_label(maErrInvalidNameCellRefStr);
+aHelpText = maErrInvalidNameCellRefStr;
}
-m_xBtnAdd->set_sensitive(false);
-return false;
+bIsNameValid = false;
}
else if
(pRangeName->findByUpperName(ScGlobal::getCharClassPtr()->uppercase(aName)))
{
-m_xFtInfo->set_label_type(weld::LabelType::Error);
-m_xFtInfo->set_label(maErrNameInUse);
-m_xBtnAdd->set_sensitive(false);
-return false;
+aHelpText = maErrNameInUse;
+bIsNameValid = false;
}
if (!IsFormulaValid())
{
-m_xFtInfo->set_label_type(weld::LabelType::Error);
-m_xBtnAdd->set_sensitive(false);
-return false;
+bIsNameValid = false;
}
-m_xFtInfo->set_label(maStrInfoDefault);
-m_xBtnAdd->set_sensitive(true);
-return true;
+m_xEdName->set_tooltip_text(aHelpText);
+m_xEdName->set_message_type(bIsNameValid || aName.isEmpty() ?
weld::EntryMessageType::Normal
+:
weld::EntryMessageType::Error);
+m_xBtnAdd->set_sensitive(bIsNameValid);
+return bIsNameValid;
}
void ScNameDefDlg::AddPushed()
diff --git a/vcl/source/uitest/uiobject.cxx b/vcl/source/uitest/uiobject.cxx
index fc72053074c6..4d8390e212a2 100644
--- a/vcl/source/uitest/uiobject.cxx
+++ b/vcl/source/uitest/uiobject.cxx
@@ -785,6 +785,7 @@ Strin
[Libreoffice-commits] core.git: officecfg/registry
officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ac87ae4615fc96c247ca98a321c69400411dab06 Author: Gabor Kelemen AuthorDate: Sun Apr 4 18:38:06 2021 +0200 Commit: Heiko Tietze CommitDate: Mon Apr 12 08:41:31 2021 +0200 tdf#141397 Add accelerator key for Insert cross-reference Change-Id: I4d2c6ec9824b5c397f287d9fdc11000c3c597762 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113570 Tested-by: Jenkins Reviewed-by: Heiko Tietze diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu index 1b0c4778a47f..535f4d0b86ce 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu @@ -583,7 +583,7 @@ - Cross-reference... + Cross-~reference... Insert Cross-reference ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: readlicense_oo/license swext/mediawiki
readlicense_oo/license/NOTICE| 29 - swext/mediawiki/src/THIRDPARTYLICENSEREADME.html | 49 --- 2 files changed, 78 deletions(-) New commits: commit bdf296526b47f8507773063765a7635fb121a760 Author: Stephan Bergmann AuthorDate: Fri Apr 9 09:36:44 2021 +0200 Commit: Stephan Bergmann CommitDate: Sun Apr 11 09:18:49 2021 +0200 Apache Commons Codec/HttpClient/Lang are no longer bundled ...ever since a41a4a22f1a7e82ab64f28b71f5ce6acc1c04921 "remove now unneeded apache-commons libs" Change-Id: I197063d6a2f34d4800383ead1f55da47054e67af Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113831 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/readlicense_oo/license/NOTICE b/readlicense_oo/license/NOTICE index 46b7fccaf737..b6cef3f0a679 100644 --- a/readlicense_oo/license/NOTICE +++ b/readlicense_oo/license/NOTICE @@ -77,35 +77,6 @@ modifications by Spyglass Inc., Carnegie Mellon University, and Bell Communications Research, Inc (Bellcore). -Apache Commons Codec -Copyright 2002-2012 The Apache Software Foundation - -This product includes software developed by -The Apache Software Foundation (http://www.apache.org/). - -src/test/org/apache/commons/codec/language/DoubleMetaphoneTest.java contains -test data from http://aspell.sourceforge.net/test/batch0.tab. - -Copyright (C) 2002 Kevin Atkinson (kev...@gnu.org). Verbatim copying -and distribution of this entire article is permitted in any medium, -provided this notice is preserved. - -Apache Jakarta HttpClient -Copyright 1999-2007 The Apache Software Foundation - -This product includes software developed by -The Apache Software Foundation (http://www.apache.org/). - -Apache Commons Lang -Copyright 2001-2012 The Apache Software Foundation - -This product includes software developed by -The Apache Software Foundation (http://www.apache.org/). - -This product includes software from the Spring Framework, -under the Apache License 2.0 (see: StringUtils.containsWhitespace()) - - Apache Commons Logging Copyright 2003-2007 The Apache Software Foundation diff --git a/swext/mediawiki/src/THIRDPARTYLICENSEREADME.html b/swext/mediawiki/src/THIRDPARTYLICENSEREADME.html index fbd8b0bfdca0..877661330b6b 100644 --- a/swext/mediawiki/src/THIRDPARTYLICENSEREADME.html +++ b/swext/mediawiki/src/THIRDPARTYLICENSEREADME.html @@ -10,27 +10,6 @@ DO NOT TRANSLATE OR LOCALIZE THIS DOCUMENT - The Apache Software Foundation - - - Commons Codec - - - - The Apache Software Foundation - - - Commons HTTP Client - - - - The Apache Software Foundation - - - Commons Lang - - - The Apache Software Foundation @@ -51,34 +30,6 @@ Foundation The following software may be included in this product: Jakarta Commons Codec; Use of any of this software is governed by the terms of the license below: -The Apache Software -Foundation - -Commons Codec - - Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION 1. Definitions. "License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document. "Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License. "Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity. "You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License. "Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files. "Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types. "Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below). "Derivative Works" shall me an any work, whether in Source or Object form, that is based on (or derived from) the Work and
[Libreoffice-commits] core.git: vcl/source
vcl/source/control/button.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 2b24c9ee832ceff6e6e6ae3f4525e8e77e8df8dc
Author: Andrea Gelmini
AuthorDate: Sun Apr 11 09:28:31 2021 +0200
Commit: Julien Nabet
CommitDate: Sun Apr 11 09:59:22 2021 +0200
Fix typo
Change-Id: I197ccc8f24cae23c7056245b009f1aac90895040
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113940
Tested-by: Julien Nabet
Reviewed-by: Julien Nabet
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index f2c413de8478..f26561cf0890 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -695,7 +695,7 @@ void
PushButton::ImplDrawPushButtonFrame(vcl::RenderContext& rRenderContext,
StyleSettings aStyleSettings = aSettings.GetStyleSettings();
if (nStyle & DrawButtonFlags::Highlight)
{
-// with the custom background, native highlight do nothing, so
code bellow mimic
+// with the custom background, native highlight do nothing, so
code below mimic
// native highlight by changing luminance
Color controlBackgroundColorHighlighted = GetControlBackground();
sal_uInt8 colorLuminance =
controlBackgroundColorHighlighted.GetLuminance();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Dictionary_eo.mk eo/desc_en.txt eo/desc_eo.txt eo/description.xml eo/dictionaries.xcu eo/eo.aff eo/eo.dic eo/hyph_eo.dic eo/license-en.txt eo/META-INF eo/packag
Dictionary_eo.mk | 24 Module_dictionaries.mk |1 eo/META-INF/manifest.xml |6 eo/desc_en.txt |1 eo/desc_eo.txt |1 eo/description.xml | 23 eo/dictionaries.xcu| 40 eo/eo.aff | 1101 + eo/eo.dic |29572 + eo/hyph_eo.dic | 3407 + eo/license-en.txt | 674 + eo/package-description.txt |2 eo/th_eo.dat |11877 ++ eo/th_eo.idx | 5940 + 14 files changed, 52669 insertions(+) New commits: commit 96ecb3d82f441c8ba38e7f773c5941e502acaf1c Author: Carmen Bianca Bakker AuthorDate: Thu Feb 4 13:13:07 2021 +0100 Commit: Andras Timar CommitDate: Sun Apr 11 10:01:47 2021 +0200 Add Esperanto dictionary Signed-off-by: Carmen Bianca Bakker Change-Id: I1852b0eedc9b397c43f213dab60ff08e44b01678 Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/110415 Tested-by: Andras Timar Reviewed-by: Andras Timar diff --git a/Dictionary_eo.mk b/Dictionary_eo.mk new file mode 100644 index 000..5d233cf --- /dev/null +++ b/Dictionary_eo.mk @@ -0,0 +1,24 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_Dictionary_Dictionary,dict-eo,dictionaries/eo)) + +$(eval $(call gb_Dictionary_add_root_files,dict-eo,\ + dictionaries/eo/eo.aff \ + dictionaries/eo/eo.dic \ + dictionaries/eo/hyph_eo.dic \ + dictionaries/eo/license-en.txt \ + dictionaries/eo/package-description.txt \ +)) + +$(eval $(call gb_Dictionary_add_thesauri,dict-eo,\ + dictionaries/eo/th_eo.dat \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/Module_dictionaries.mk b/Module_dictionaries.mk index 2b6a48b..859d9d2 100644 --- a/Module_dictionaries.mk +++ b/Module_dictionaries.mk @@ -32,6 +32,7 @@ $(eval $(call gb_Module_add_l10n_targets,dictionaries,\ Dictionary_de \ Dictionary_el \ Dictionary_en \ + Dictionary_eo \ Dictionary_es \ Dictionary_et \ Dictionary_fr \ diff --git a/eo/META-INF/manifest.xml b/eo/META-INF/manifest.xml new file mode 100644 index 000..f9bdc53 --- /dev/null +++ b/eo/META-INF/manifest.xml @@ -0,0 +1,6 @@ + + +http://openoffice.org/2001/manifest";> + + + diff --git a/eo/desc_en.txt b/eo/desc_en.txt new file mode 100644 index 000..39bb16f --- /dev/null +++ b/eo/desc_en.txt @@ -0,0 +1 @@ +This package provides dictionaries for spelling, thesaurus, and hyphenation for Esperanto. diff --git a/eo/desc_eo.txt b/eo/desc_eo.txt new file mode 100644 index 000..73a63f6 --- /dev/null +++ b/eo/desc_eo.txt @@ -0,0 +1 @@ +Tiu ĉi pakaĵo provizas vortaron por literumado, tezaŭron kaj regulojn de vortodivido por Esperanto. diff --git a/eo/description.xml b/eo/description.xml new file mode 100644 index 000..cd96719 --- /dev/null +++ b/eo/description.xml @@ -0,0 +1,23 @@ + +http://openoffice.org/extensions/description/2006"; xmlns:d="http://openoffice.org/extensions/description/2006"; xmlns:xlink="http://www.w3.org/1999/xlink";> + + + +Spelling dictionary, thesaurus, and hyphenator for Esperanto +Словарь проверки орфографии, тезаурус и правила переноса для эсперанто +Vortaro por literumado, tezaŭro kaj reguloj de vortodivido por Esperanto + + + + + + + + + + + + + + + diff --git a/eo/dictionaries.xcu b/eo/dictionaries.xcu new file mode 100644 index 000..0b8db7a --- /dev/null +++ b/eo/dictionaries.xcu @@ -0,0 +1,40 @@ + +http://openoffice.org/2001/registry"; xmlns:xs="http://www.w3.org/2001/XMLSchema"; oor:package="org.openoffice.Office" oor:name="Linguistic"> + + + + +%origin%/eo.aff %origin%/eo.dic + + +DICT_SPELL + + +eo eo-EO + + + + +%origin%/hyph_eo.dic + + +DICT_HYPH + + +eo eo-EO + + + + +%origin%/th_eo.dat + + +DICT_THES + + +eo eo-EO + + + + + diff --git a/eo/eo.aff b/eo/eo.aff new file mode 100644 index 000..aa9d4c3 --- /dev/null +++ b/eo/eo.aff @@ -0,0 +1,1101 @@ +# Tiu dosiero estas publikigita laŭ GPL Permesilo +# legu plu sur: http://www.gnu.org +# +# This file is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT A
[Libreoffice-commits] core.git: dictionaries
dictionaries |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 43a0f443a0484d516ffcf7c31b7d357f7cbf4d0d Author: Carmen Bianca Bakker AuthorDate: Sun Apr 11 09:01:47 2021 +0100 Commit: Gerrit Code Review CommitDate: Sun Apr 11 10:01:47 2021 +0200 Update git submodules * Update dictionaries from branch 'master' to 96ecb3d82f441c8ba38e7f773c5941e502acaf1c - Add Esperanto dictionary Signed-off-by: Carmen Bianca Bakker Change-Id: I1852b0eedc9b397c43f213dab60ff08e44b01678 Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/110415 Tested-by: Andras Timar Reviewed-by: Andras Timar diff --git a/dictionaries b/dictionaries index a968e48f9b2f..96ecb3d82f44 16 --- a/dictionaries +++ b/dictionaries @@ -1 +1 @@ -Subproject commit a968e48f9b2fcef76282a0d0281cf38e1b108e29 +Subproject commit 96ecb3d82f441c8ba38e7f773c5941e502acaf1c ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: icon-themes/sukapura icon-themes/sukapura_svg
icon-themes/sukapura/svx/res/markers.png |binary icon-themes/sukapura_svg/svx/res/markers.svg |2 +- 2 files changed, 1 insertion(+), 1 deletion(-) New commits: commit d9f10d8f0f6bae31dd5ebd9fa00f989d17fc21da Author: Rizal Muttaqin AuthorDate: Sun Apr 11 12:37:15 2021 +0700 Commit: Rizal Muttaqin CommitDate: Sun Apr 11 10:06:44 2021 +0200 Sukapura: tdf#141618 fix blured vertical line of Sukapura's anchor marker Change-Id: I11b3fca85ec00049dfe84df6cfb548a320e255cc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113937 Tested-by: Jenkins Reviewed-by: Rizal Muttaqin diff --git a/icon-themes/sukapura/svx/res/markers.png b/icon-themes/sukapura/svx/res/markers.png index 38c2f92c6047..0ce89a9f3275 100644 Binary files a/icon-themes/sukapura/svx/res/markers.png and b/icon-themes/sukapura/svx/res/markers.png differ diff --git a/icon-themes/sukapura_svg/svx/res/markers.svg b/icon-themes/sukapura_svg/svx/res/markers.svg index d6bedcbca334..ba34c35ad91d 100644 --- a/icon-themes/sukapura_svg/svx/res/markers.svg +++ b/icon-themes/sukapura_svg/svx/res/markers.svg @@ -1 +1 @@ -http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink";>< linearGradient id="ad" gradientUnits="userSpaceOnUse" x1="38.5" x2="38.5" xlink:href="#t" y1="30" y2="23"/>< path d="m53 16.50002a4.5 4.5 0 0 1 -4.5 4.5 4.5 4.5 0 0 1 -4.5-4.5 4.5 4.5 0 0 1 4.5-4.5 4.5 4.5 0 0 1 4.5 4.5z" fill="url(#at)"/> \ No newline at end of file +http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink";>< linearGradient id="ad" gradientUnits="userSpaceOnUse" x1="38.5" x2="38.5" xlink:href="#t" y1="30" y2="23"/> \ 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: config_host.mk.in configure.ac distro-configs/LibreOfficeFlatpak.conf download.lst external/apache-commons external/Module_external.mk Makefile.fetch readlicense_oo/lic
Makefile.fetch |1 RepositoryExternal.mk | 26 - config_host.mk.in |3 configure.ac | 40 distro-configs/LibreOfficeFlatpak.conf |1 download.lst |2 external/Module_external.mk |1 external/apache-commons/ExternalPackage_apache_commons_logging.mk | 16 --- external/apache-commons/ExternalProject_apache_commons_logging.mk | 32 -- external/apache-commons/Makefile |7 - external/apache-commons/Module_apache-commons.mk | 18 --- external/apache-commons/README |1 external/apache-commons/UnpackedTarball_apache_commons_logging.mk | 22 external/apache-commons/patches/logging.patch | 46 - readlicense_oo/license/NOTICE |8 - readlicense_oo/license/license.xml |6 - reportbuilder/Jar_reportbuilder.mk |1 reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java |7 - reportbuilder/java/org/libreoffice/report/StorageRepository.java | 48 -- reportbuilder/java/org/libreoffice/report/pentaho/Manifest.mf |2 reportbuilder/java/org/libreoffice/report/pentaho/PentahoReportJob.java | 10 -- reportbuilder/java/org/libreoffice/report/pentaho/SOReportJobFactory.java |9 - reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormatValueUtility.java |2 reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/FormattedTextLayoutController.java |7 - reportbuilder/java/org/libreoffice/report/pentaho/layoutprocessor/ImageElementLayoutController.java | 19 +-- reportbuilder/java/org/libreoffice/report/pentaho/output/ImageProducer.java | 23 ++-- reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java | 23 ++-- reportbuilder/java/org/libreoffice/report/pentaho/output/OleProducer.java | 12 +- reportbuilder/java/org/libreoffice/report/pentaho/output/StyleUtilities.java | 10 -- reportbuilder/java/org/libreoffice/report/pentaho/output/spreadsheet/SpreadsheetRawReportTarget.java |2 reportbuilder/java/org/libreoffice/report/pentaho/parser/office/DocumentContentReadHandler.java | 13 +- solenv/flatpak-manifest.in |6 - swext/mediawiki/src/THIRDPARTYLICENSEREADME.html | 16 --- 33 files changed, 82 insertions(+), 358 deletions(-) New commits: commit 6de0b1710adfba82c96b75a5da6f52633a54c692 Author: Stephan Bergmann AuthorDate: Sun Apr 11 09:20:13 2021 +0200 Commit: Stephan Bergmann CommitDate: Sun Apr 11 10:35:04 2021 +0200 Get rid of apache-commons-logging ...using Java 1.4 java.util.logging.Logger instead also for the last remaining uses in reportbuilder. (The mention in swext/mediawiki/src/THIRDPARTYLICENSEREADME.html was presumably a leftover from 4b6ceed4a4a9b152905a8b1712ffb9bd61373c16 "swext: Wiki Publisher does not use those apache-commons libraries".) Change-Id: Ia0bc598fe5844ced11cae497548ec7d09453a99d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113939 Tested-by: Jenkins Reviewed-by: Stephan Bergmann diff --git a/Makefile.fetch b/Makefile.fetch index a69a5161ff6e..550a9603c6bd 100644 --- a/Makefile.fetch +++ b/Makefile.fetch @@ -101,7 +101,6 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk $(SRCDIR)/download.lst $(S @date >> $(fetch_LOGFILE) $(foreach item, \ $(call fetch_Optional,ABW,ABW_TARBALL) \ - $(call fetch_Optional,APACHE_COMMONS,APACHE_COMMONS_LOGGING_TA
