[Libreoffice-commits] core.git: sc/qa svl/qa svl/source
sc/qa/unit/ucalc.cxx |8 +--
svl/qa/unit/svl.cxx | 25 +--
svl/source/misc/sharedstringpool.cxx | 74 +--
3 files changed, 62 insertions(+), 45 deletions(-)
New commits:
commit 5af636c5021ecf7fba8f5f34cc6af929f1e04b4c
Author: Noel Grandin
AuthorDate: Wed Jun 10 15:27:48 2020 +0200
Commit: Noel Grandin
CommitDate: Fri Jun 12 08:50:29 2020 +0200
fix ASAN in SharedStringPool
regression from
commit 3581f1d71ae0d431ba28c0f3b7b263ff6212ce7b
optimize SharedStringPool::purge() and fix tests
which results in us potentially de-referencing an already de-allocated
OUString object in the first loop in purge().
So switch to a different strategy, which only needs one data structure,
instead of two.
Change-Id: Iaac6beda48459643afdb7b14ce7d39d68a93339c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95226
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 49cd337570a1..eb9636caaea1 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -207,25 +207,25 @@ void Test::testSharedStringPool()
// Check the string counts after purging. Purging shouldn't remove any
strings in this case.
svl::SharedStringPool& rPool = m_pDoc->GetSharedStringPool();
rPool.purge();
-CPPUNIT_ASSERT_EQUAL(static_cast(4), rPool.getCount());
+CPPUNIT_ASSERT_EQUAL(static_cast(5), rPool.getCount());
CPPUNIT_ASSERT_EQUAL(static_cast(2), rPool.getCountIgnoreCase());
// Clear A1 and purge again.
clearRange(m_pDoc, ScAddress(0,0,0));
rPool.purge();
-CPPUNIT_ASSERT_EQUAL(static_cast(4), rPool.getCount());
+CPPUNIT_ASSERT_EQUAL(static_cast(5), rPool.getCount());
CPPUNIT_ASSERT_EQUAL(static_cast(2), rPool.getCountIgnoreCase());
// Clear A2 and purge again.
clearRange(m_pDoc, ScAddress(0,1,0));
rPool.purge();
-CPPUNIT_ASSERT_EQUAL(static_cast(3), rPool.getCount());
+CPPUNIT_ASSERT_EQUAL(static_cast(4), rPool.getCount());
CPPUNIT_ASSERT_EQUAL(static_cast(2), rPool.getCountIgnoreCase());
// Clear A3 and purge again.
clearRange(m_pDoc, ScAddress(0,2,0));
rPool.purge();
-CPPUNIT_ASSERT_EQUAL(static_cast(2), rPool.getCount());
+CPPUNIT_ASSERT_EQUAL(static_cast(3), rPool.getCount());
CPPUNIT_ASSERT_EQUAL(static_cast(2), rPool.getCountIgnoreCase());
// Clear A4 and purge again.
diff --git a/svl/qa/unit/svl.cxx b/svl/qa/unit/svl.cxx
index 194dc550c278..c32017f7aea6 100644
--- a/svl/qa/unit/svl.cxx
+++ b/svl/qa/unit/svl.cxx
@@ -60,6 +60,7 @@ public:
void testSharedString();
void testSharedStringPool();
void testSharedStringPoolPurge();
+void testSharedStringPoolPurgeBug1();
void testFdo60915();
void testI116701();
void testTdf103060();
@@ -77,6 +78,7 @@ public:
CPPUNIT_TEST(testSharedString);
CPPUNIT_TEST(testSharedStringPool);
CPPUNIT_TEST(testSharedStringPoolPurge);
+CPPUNIT_TEST(testSharedStringPoolPurgeBug1);
CPPUNIT_TEST(testFdo60915);
CPPUNIT_TEST(testI116701);
CPPUNIT_TEST(testTdf103060);
@@ -376,30 +378,30 @@ void Test::testSharedStringPoolPurge()
std::optional pStr3 = aPool.intern("ANDY");
std::optional pStr4 = aPool.intern("Bruce");
-CPPUNIT_ASSERT_EQUAL(static_cast(4), aPool.getCount());
+CPPUNIT_ASSERT_EQUAL(static_cast(5), aPool.getCount());
CPPUNIT_ASSERT_EQUAL(static_cast(2), aPool.getCountIgnoreCase());
// This shouldn't purge anything.
aPool.purge();
-CPPUNIT_ASSERT_EQUAL(static_cast(4), aPool.getCount());
+CPPUNIT_ASSERT_EQUAL(static_cast(5), aPool.getCount());
CPPUNIT_ASSERT_EQUAL(static_cast(2), aPool.getCountIgnoreCase());
// Delete one heap string object, and purge. That should purge one string.
pStr1.reset();
aPool.purge();
-CPPUNIT_ASSERT_EQUAL(static_cast(3), aPool.getCount());
+CPPUNIT_ASSERT_EQUAL(static_cast(4), aPool.getCount());
CPPUNIT_ASSERT_EQUAL(static_cast(2), aPool.getCountIgnoreCase());
// Nothing changes, because the upper-string is still in the map
pStr3.reset();
aPool.purge();
-CPPUNIT_ASSERT_EQUAL(static_cast(3), aPool.getCount());
+CPPUNIT_ASSERT_EQUAL(static_cast(4), aPool.getCount());
CPPUNIT_ASSERT_EQUAL(static_cast(2), aPool.getCountIgnoreCase());
// Again.
pStr2.reset();
aPool.purge();
-CPPUNIT_ASSERT_EQUAL(static_cast(1), aPool.getCount());
+CPPUNIT_ASSERT_EQUAL(static_cast(2), aPool.getCount());
CPPUNIT_ASSERT_EQUAL(static_cast(1), aPool.getCountIgnoreCase());
// Delete 'Bruce' and purge.
@@ -409,6 +411,19 @@ void Test::testSharedStringPoolPurge()
CPPUNIT_ASSERT_EQUAL(static_cast(0), aPool.getCountIgnoreCase());
}
+void Test::testSharedStringPoolPurgeBug1()
+{
+// We had a bug where, if we had two strings that mapped to the same
uppercase
Re[6]: Building LO from source
Hi Regis, I didn't use --without-doxygen option. I'll add this, hopefully, it will compile much faster. The institution I'm giving LO is asking to remove some of the "apps" that they are not going to use. Those apps may stay in the compiled package, but I don't want users to see those apps. It's like installing MS Office with unchecking MS Access. The office software is still fully functional, but the users can't use or even see Access app. This is what I want to do with LO. Regards -- Original Message -- From: "Regis Perdreau" To: "libreoffice-dev" Sent: 12-Jun-20 9:22:06 AM Subject: Re: Re[4]: Building LO from source HI Ismet, I can confirm (IMHO) that you can't exclude easily some part from LO, it's not designed in this way...For example, Impress depends from Draw. You need Calc to embed sheets in Writer, etc... Have you set an autogen.input file to exclude the doxygen documentation (--without-doxygen) ?...It takes ages on my computer to be generated. On my computer, a ridiculous core I3-6100 8Go nowadays, it takes around 2h to compile LO from scratch under Linux. Regards Régis Perdreau Le ven. 12 juin 2020 à 07:59, Ismet Bahadir a écrit : Thank you very much Tor, Yes, I didn't know the terminology, so I trusted that you would understand :) It takes over 5 hours to compile on my pc but I have a powerful machine with 64 cores and 128 GM ram. I think that will be faster. I'll try and get back to you. But I still do not know why the extension successfully installs on Ubuntu but fails on Debian. Regards -- Original Message -- From: "Tor Lillqvist" To: "Ismet Bahadir" Cc: "Stephan Bergmann" ; "libreoffice-dev" Sent: 12-Jun-20 8:55:57 AM Subject: Re: Re[2]: Building LO from source I think it's best to recompile the source from scratch with official DEB packaging system. IMHO, as an outsider, only Debian's own way to package LibreOffice can be said to be "official". It is *very* different from the way TDF packages LibreOffice in the .deb format. How can I exclude some of the apps such as "Draw"? Draw (and Writer, Calc, etc) are not "apps" as such IMHO but different kinds of documents that the one same app, LibreOffice, manages using the same soffice.bin process. But that is just terminology, we know what you mean. Is it possible that each app has its own DEB installation file so that I won't be installing it if I skip its DEB file? That *is* exactly how the real Debian packages for LibreOffice are structured. See https://packages.debian.org/buster/libreoffice Also many (most?) other Linux distros, like Fedora for instance, split LibreOffice into multiple packages, like libreoffice-core, libreoffice-writer, libreoffice-calc, libreoffice-draw, etc. (As such, I don't think that it makes sense to split up LibreOffice like that, I find it fairly pointless, old-fashioned and needlessly complex, but then I am not a Linux zealot, I like macOS more. But just ignore me here.) --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Re[4]: Building LO from source
HI Ismet, I can confirm (IMHO) that you can't exclude easily some part from LO, it's not designed in this way...For example, Impress depends from Draw. You need Calc to embed sheets in Writer, etc... Have you set an autogen.input file to exclude the doxygen documentation (--without-doxygen) ?...It takes ages on my computer to be generated. On my computer, a ridiculous core I3-6100 8Go nowadays, it takes around 2h to compile LO from scratch under Linux. Regards Régis Perdreau Le ven. 12 juin 2020 à 07:59, Ismet Bahadir a écrit : > Thank you very much Tor, > > Yes, I didn't know the terminology, so I trusted that you would understand > :) > > It takes over 5 hours to compile on my pc but I have a powerful machine > with 64 cores and 128 GM ram. I think that will be faster. > > I'll try and get back to you. But I still do not know why the extension > successfully installs on Ubuntu but fails on Debian. > > Regards > > -- Original Message -- > From: "Tor Lillqvist" > To: "Ismet Bahadir" > Cc: "Stephan Bergmann" ; "libreoffice-dev" < > libreoffice@lists.freedesktop.org> > Sent: 12-Jun-20 8:55:57 AM > Subject: Re: Re[2]: Building LO from source > > > >> I think it's best to recompile the source from scratch with official DEB >> packaging system. >> > > IMHO, as an outsider, only Debian's own way to package LibreOffice can be > said to be "official". It is *very* different from the way TDF packages > LibreOffice in the .deb format. > > How can I exclude some of the apps such as "Draw"? > > > Draw (and Writer, Calc, etc) are not "apps" as such IMHO but different > kinds of documents that the one same app, LibreOffice, manages using the > same soffice.bin process. But that is just terminology, we know what you > mean. > > >> Is it possible that >> each app has its own DEB installation file so that I won't be installing >> it if I skip its DEB file? > > > That *is* exactly how the real Debian packages for LibreOffice are > structured. See https://packages.debian.org/buster/libreoffice Also many > (most?) other Linux distros, like Fedora for instance, split LibreOffice > into multiple packages, like libreoffice-core, libreoffice-writer, > libreoffice-calc, libreoffice-draw, etc. > > (As such, I don't think that it makes sense to split up LibreOffice like > that, I find it fairly pointless, old-fashioned and needlessly complex, but > then I am not a Linux zealot, I like macOS more. But just ignore me here.) > > --tml > > ___ > LibreOffice mailing list > LibreOffice@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/libreoffice > ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] online.git: loleaflet/archived-packages loleaflet/npm-shrinkwrap.json.in
dev/null|binary loleaflet/archived-packages/@braintree/sanitize-url-4.0.1-4c7210b55.tar |binary loleaflet/archived-packages/acorn-5.7.4-d43fbe546.tar |binary loleaflet/archived-packages/acorn-7.3.1-b4b734c12.tar |binary loleaflet/archived-packages/acorn-node-1.8.2-f26b7e7ec.tar |binary loleaflet/archived-packages/acorn-walk-7.1.1-c1d94f636.tar |binary loleaflet/archived-packages/arr-diff-4.0.0-d6461074f.tar|binary loleaflet/archived-packages/arr-union-3.1.0-e39b09aea.tar |binary loleaflet/archived-packages/array-unique-0.3.2-a894b75d4.tar|binary loleaflet/archived-packages/assert-1.5.0-103b206b0.tar |binary loleaflet/archived-packages/assign-symbols-1.0.0-59667f41f.tar |binary loleaflet/archived-packages/atob-2.1.2-5a6eae928.tar|binary loleaflet/archived-packages/autolinker-3.14.1-cafb111c8.tar |binary loleaflet/archived-packages/base-0.11.2-e53e8fe31.tar |binary loleaflet/archived-packages/base64-js-1.3.1-98b4388b6.tar |binary loleaflet/archived-packages/bn.js-4.11.9-13a42862a.tar |binary loleaflet/archived-packages/bn.js-5.1.2-e34ad969f.tar |binary loleaflet/archived-packages/braces-2.3.2-68d75b9e3.tar |binary loleaflet/archived-packages/browserify-16.5.1-1105f4879.tar |binary loleaflet/archived-packages/browserify-css-0.15.0-6602c7c99.tar |binary loleaflet/archived-packages/browserify-sign-4.2.0-844642d4a.tar |binary loleaflet/archived-packages/browserify-zlib-0.2.0-67de36472.tar |binary loleaflet/archived-packages/buffer-5.2.1-73e2a8d25.tar |binary loleaflet/archived-packages/cache-base-1.0.1-00a71d4e7.tar |binary loleaflet/archived-packages/class-utils-0.3.6-a8e84f6bf.tar |binary loleaflet/archived-packages/clean-css-4.2.3-55c3160cd.tar |binary loleaflet/archived-packages/collection-visit-1.0.0-4bc0373c1.tar|binary loleaflet/archived-packages/commander-2.20.3-1a956498c.tar |binary loleaflet/archived-packages/component-emitter-1.3.0-45ddec7ba.tar |binary loleaflet/archived-packages/console-browserify-1.2.0-64c9183bf.tar |binary loleaflet/archived-packages/copy-descriptor-0.1.1-676f6eb3c.tar |binary loleaflet/archived-packages/css-2.2.4-a149e3996.tar |binary loleaflet/archived-packages/d3-5.16.0-e0f2f9847.tar |binary loleaflet/archived-packages/d3-array-1.2.4-2875ba33c.tar|binary loleaflet/archived-packages/d3-axis-1.0.12-7a320d3df.tar|binary loleaflet/archived-packages/d3-brush-1.1.5-ac4689e60.tar|binary loleaflet/archived-packages/d3-chord-1.0.6-2570360eb.tar|binary loleaflet/archived-packages/d3-collection-1.0.7-8a2d3faf9.tar |binary loleaflet/archived-packages/d3-color-1.4.1-a76b131d2.tar|binary loleaflet/archived-packages/d3-contour-1.3.2-8683e9e0a.tar |binary loleaflet/archived-packages/d3-dispatch-1.0.6-7d58e8125.tar |binary loleaflet/archived-packages/d3-drag-1.2.5-ac3d68865.tar |binary loleaflet/archived-packages/d3-dsv-1.2.0-f72565aaf.tar |binary loleaflet/archived-packages/d3-ease-1.0.6-499fe5554.tar |binary loleaflet/archived-packages/d3-fetch-1.2.0-c82efc341.tar|binary loleaflet/archived-packages/d3-force-1.2.1-1c7bde872.tar|binary loleaflet/archived-packages/d3-format-1.4.4-4d692cdb9.tar |binary loleaflet/archived-packages/d3-geo-1.12.1-5c6e1dd5c.tar |binary loleaflet/archived-packages/d3-hierarchy-1.1.9-8fcb4fc65.tar|binary loleaflet/archived-packages/d3-interpolate-1.4.0-57dce72b4.tar |binary loleaflet/archived-packages/d3-path-1.0.9-54b698727.tar |binary loleaflet/archived-packages/d3-polygon-1.0.6-93e445ed6.tar |binary loleaflet/archived-packages/d3-quadtree-1.0.7-44a3c0797.tar |binary loleaflet/archived-packages/d3-random-1.1.2-e802b904d.tar |binary loleaflet/archived-packages/d3-scale-2.2.2-2db784bc6.tar|binary loleaflet/archived-packages/d3-scale-chromatic-1.5.0-00270be3a.tar |binary loleaflet/archived-packages/d3-selection-1.4.1-05321b463.tar|binary loleaflet/archived-packages/d3-shape-1.3.7-11492f2a3.tar|binary loleaflet/archived-packages/d3-time-1.1.0-5e1d22b2b.tar |binary loleaflet/archived-packages/d3-time-format-2.2.3-4401cd9c3.tar |binary loleaflet/archived-packages/d3-timer-1.0.10-0752439b4.tar |binary loleaflet/archived-packages/d3-transition-1.3.2-b1cd20454
Re[4]: Building LO from source
Thank you very much Tor, Yes, I didn't know the terminology, so I trusted that you would understand :) It takes over 5 hours to compile on my pc but I have a powerful machine with 64 cores and 128 GM ram. I think that will be faster. I'll try and get back to you. But I still do not know why the extension successfully installs on Ubuntu but fails on Debian. Regards -- Original Message -- From: "Tor Lillqvist" To: "Ismet Bahadir" Cc: "Stephan Bergmann" ; "libreoffice-dev" Sent: 12-Jun-20 8:55:57 AM Subject: Re: Re[2]: Building LO from source I think it's best to recompile the source from scratch with official DEB packaging system. IMHO, as an outsider, only Debian's own way to package LibreOffice can be said to be "official". It is *very* different from the way TDF packages LibreOffice in the .deb format. How can I exclude some of the apps such as "Draw"? Draw (and Writer, Calc, etc) are not "apps" as such IMHO but different kinds of documents that the one same app, LibreOffice, manages using the same soffice.bin process. But that is just terminology, we know what you mean. Is it possible that each app has its own DEB installation file so that I won't be installing it if I skip its DEB file? That *is* exactly how the real Debian packages for LibreOffice are structured. See https://packages.debian.org/buster/libreoffice Also many (most?) other Linux distros, like Fedora for instance, split LibreOffice into multiple packages, like libreoffice-core, libreoffice-writer, libreoffice-calc, libreoffice-draw, etc. (As such, I don't think that it makes sense to split up LibreOffice like that, I find it fairly pointless, old-fashioned and needlessly complex, but then I am not a Linux zealot, I like macOS more. But just ignore me here.) --tml___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Re[2]: Building LO from source
> I think it's best to recompile the source from scratch with official DEB > packaging system. > IMHO, as an outsider, only Debian's own way to package LibreOffice can be said to be "official". It is *very* different from the way TDF packages LibreOffice in the .deb format. How can I exclude some of the apps such as "Draw"? Draw (and Writer, Calc, etc) are not "apps" as such IMHO but different kinds of documents that the one same app, LibreOffice, manages using the same soffice.bin process. But that is just terminology, we know what you mean. > Is it possible that > each app has its own DEB installation file so that I won't be installing > it if I skip its DEB file? That *is* exactly how the real Debian packages for LibreOffice are structured. See https://packages.debian.org/buster/libreoffice Also many (most?) other Linux distros, like Fedora for instance, split LibreOffice into multiple packages, like libreoffice-core, libreoffice-writer, libreoffice-calc, libreoffice-draw, etc. (As such, I don't think that it makes sense to split up LibreOffice like that, I find it fairly pointless, old-fashioned and needlessly complex, but then I am not a Linux zealot, I like macOS more. But just ignore me here.) --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Re[2]: Building LO from source
Thanks Setphan, I think it's best to recompile the source from scratch with official DEB packaging system. How can I exclude some of the apps such as "Draw"? Is it possible that each app has its own DEB installation file so that I won't be installing it if I skip its DEB file? Or, is there a parameter for excluding apps? Regards -- Original Message -- From: "Stephan Bergmann" To: libreoffice@lists.freedesktop.org Cc: "Ismet Bahadir" Sent: 11-Jun-20 2:08:14 PM Subject: Re: Building LO from source On 11/06/2020 12:35, Ismet Bahadir wrote: I understand, thanks. I'll try that but compiling takes too much time. Can you guess why the extension installs successfully under Ubuntu but fails at Debian? The error message is: Binary URP bridge disposed during call. I'm afraid to face the same error after following your instructions, that's why I'm trying to understand the root cause of the problem. It likely means that the uno -> uno.bin process, spawned from soffice.bin when installing an extension, crashed (and in which case it should have generated a core file, if you have that enabled at the OS level). ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: 6.4.4.4 libssl error
I went with the 6.4.5.1 tag and it got past this error. But now I am facing the error with unit test failure for test testShapeTextAlignment in sw/qa/uibase/shells/shells.cxx This commit takes care of the error, I have requested that to be cherry picked into 6.4 and 6.4.5. But no one has responded, can someone please help? https://gerrit.libreoffice.org/c/core/+/88427/3 On Tue, Jun 9, 2020 at 4:35 PM Jan-Marek Glogowski wrote: > Am 09.06.20 um 06:48 schrieb Chetan Aru: > > I am trying to build the LibreOffice 6.4.4.4 tag on Windows machine > > (Virtual Machine). I have installed cygwin 64-bit and doing 64-bit > > build. I am getting the following errors. Can someone please help? Seems > > that having this patch ( https://gerrit.libreoffice.org/c/core/+/95559) > > helps, but how is it that 6.4.4.4 was built on Windows machine without > this? > > ... > [windows PDB SSL error messages] > ... > > As already discussed in the original / master Gerrit change > (https://gerrit.libreoffice.org/c/core/+/87358), please use the > libreoffice-6-4 branch, or otherwise just cherry-pick the fix to your > libreoffice-6-4-4 branch. > > git cherry-pick 2786e5a0e79c8e3b30fed02e27cc9973e28cd76c > should just do that. > > And nobody investigated further, why the source built for all other > people ignoring the msbuild error, but it broke for me. Still fixing the > error is definitely the correct solution, so I suggest you just do that > too. > > Jan-Narek > ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - sw/source
sw/source/core/doc/DocumentContentOperationsManager.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 78f1f48839bbeaf3e6af768cfc74c6443336d075 Author: Michael Stahl AuthorDate: Wed Jun 10 18:51:37 2020 +0200 Commit: Thorsten Behrens CommitDate: Fri Jun 12 01:14:45 2020 +0200 tdf#132254 sw: fix block selection copy reversed order The problem is that SwEditShell::CopySelToDoc() relies on the passed target SwPosition being after the target range by CopyRange(), but due to an erroneous update of aInsPos in CopyImplImpl() it was at the beginning of the target range. (regression from 28b77c89dfcafae82cf2a6d85731b643ff9290e5) Change-Id: Ie0846bd44f9349517878efcca996440bede05611 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96063 Tested-by: Jenkins Reviewed-by: Michael Stahl (cherry picked from commit 63a43218c369a43624e6bdbe880b7caa40a3b61a) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96092 Reviewed-by: Thorsten Behrens diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx b/sw/source/core/doc/DocumentContentOperationsManager.cxx index 8ba8a4c5a136..403089bdc586 100644 --- a/sw/source/core/doc/DocumentContentOperationsManager.cxx +++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx @@ -4833,10 +4833,10 @@ bool DocumentContentOperationsManager::CopyImplImpl(SwPaM& rPam, SwPosition& rPo } // copy at-char flys in rPam -aInsPos = *pDestTextNd; // update to new (start) node for flys +SwNodeIndex temp(*pDestTextNd); // update to new (start) node for flys // tdf#126626 prevent duplicate Undos ::sw::UndoGuard const ug(pDoc->GetIDocumentUndoRedo()); -CopyFlyInFlyImpl(aRg, &rPam, aInsPos, false); +CopyFlyInFlyImpl(aRg, &rPam, temp, false); break; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - sw/source
sw/source/core/doc/docedt.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ef7db957b518f19ab944fcebf83ca73a18e2357c Author: Michael Stahl AuthorDate: Wed Jun 10 17:21:45 2020 +0200 Commit: Thorsten Behrens CommitDate: Fri Jun 12 01:14:24 2020 +0200 crashtesting: sw: fix export of ooo24576-1.doc and ooo79410-1.sxw to odt Crashes because an at-char fly has its anchor node deleted, and during deletion of its text frame its SwAnchoredObject is updated, which asserts because of inconsistent anchor node in the fly and mpAnchorFrame; the immediate cause of the inconsistency is that SwNodes::RemoveNode() changed the fly's anchor node. The root cause is that in the sw_JoinText(bJoinPrev=true) code, a fly anchored at the end of the deleted node isn't moved to the surviving node. SwTextNode::JoinPrev() uses different arguments to ContentIdxStore::Save(), so use the same here. The implementation of several ContentIdxStore functions, including ContentIdxStoreImpl::SaveFlys(), ignore positions that are equal to the passed nContent index, so passing in SwTextNode::Len() looks wrong. (crash is regression from 98d1622b3721fe899c4e1faa0b4cc35695253014) Change-Id: I3a4d54258611da6b15223273a187c39770caa8e2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93583 Tested-by: Jenkins Reviewed-by: Michael Stahl (cherry picked from commit b2b234269b13d5dfd8e7123a25d282d88fee33a0) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96104 Reviewed-by: Thorsten Behrens diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx index f6e38600f1ba..a695cca98713 100644 --- a/sw/source/core/doc/docedt.cxx +++ b/sw/source/core/doc/docedt.cxx @@ -410,7 +410,7 @@ bool sw_JoinText( SwPaM& rPam, bool bJoinPrev ) pOldTextNd->FormatToTextAttr( pTextNd ); const std::shared_ptr< sw::mark::ContentIdxStore> pContentStore(sw::mark::ContentIdxStore::Create()); -pContentStore->Save( pDoc, aOldIdx.GetIndex(), pOldTextNd->Len() ); +pContentStore->Save(pDoc, aOldIdx.GetIndex(), SAL_MAX_INT32); SwIndex aAlphaIdx(pTextNd); pOldTextNd->CutText( pTextNd, aAlphaIdx, SwIndex(pOldTextNd), ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - sw/qa sw/source writerfilter/source
sw/qa/extras/ooxmlexport/data/tdf120394.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport14.cxx | 25 +
sw/qa/extras/rtfimport/rtfimport.cxx |5 +-
sw/source/core/doc/number.cxx|7 +++
sw/source/filter/ww8/wrtw8num.cxx| 30 +++
writerfilter/source/dmapper/NumberingManager.cxx | 44 +++
6 files changed, 56 insertions(+), 55 deletions(-)
New commits:
commit 129006ee5bec721bfb8bae9cd55586b353e230b7
Author: Vasily Melenchuk
AuthorDate: Sun May 17 13:35:46 2020 +0300
Commit: Thorsten Behrens
CommitDate: Fri Jun 12 01:13:55 2020 +0200
tdf#120394: DOCX list import: simplify zero width space hack
Since introducion of list format string hack with creation
of zero-width-space can be much more simple. It was being
used to indicate existing, but empty list label suffix to
avoid stripping down numbering.
Change-Id: I9a0c6047f806b2c656ef5dbab0c6b38200818bd2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94383
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95346
diff --git a/sw/qa/extras/ooxmlexport/data/tdf120394.docx
b/sw/qa/extras/ooxmlexport/data/tdf120394.docx
new file mode 100644
index ..39bd5886c0fe
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf120394.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
index ca870b54e06b..a3c63b031550 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
@@ -394,6 +394,31 @@ DECLARE_OOXMLEXPORT_TEST(testTdf129353, "tdf129353.docx")
aIndexString);
}
+DECLARE_OOXMLEXPORT_TEST(testTdf120394, "tdf120394.docx")
+{
+CPPUNIT_ASSERT_EQUAL(1, getPages());
+{
+uno::Reference xPara(getParagraph(1),
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(static_cast(0),
getProperty(xPara, "NumberingLevel"));
+CPPUNIT_ASSERT_EQUAL(OUString("1"), getProperty(xPara,
"ListLabelString"));
+}
+{
+uno::Reference xPara(getParagraph(2),
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(static_cast(1),
getProperty(xPara, "NumberingLevel"));
+CPPUNIT_ASSERT_EQUAL(OUString(CHAR_ZWSP), getProperty(xPara,
"ListLabelString"));
+}
+{
+uno::Reference xPara(getParagraph(3),
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(static_cast(1),
getProperty(xPara, "NumberingLevel"));
+CPPUNIT_ASSERT_EQUAL(OUString(CHAR_ZWSP), getProperty(xPara,
"ListLabelString"));
+}
+{
+uno::Reference xPara(getParagraph(5),
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(static_cast(2),
getProperty(xPara, "NumberingLevel"));
+CPPUNIT_ASSERT_EQUAL(OUString("1.2.1"), getProperty(xPara,
"ListLabelString"));
+}
+}
+
DECLARE_OOXMLEXPORT_TEST(testHyphenationAuto, "hyphenation.odt")
{
// Explicitly set hyphenation=auto on document level
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx
b/sw/qa/extras/rtfimport/rtfimport.cxx
index 3fe90033be59..d2c2d4d24c8f 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -341,8 +341,7 @@ CPPUNIT_TEST_FIXTURE(Test, testFdo49692)
if (rProp.Name == "Suffix")
{
-OUString aExpected(u'\x200B');
-CPPUNIT_ASSERT_EQUAL(aExpected, rProp.Value.get());
+CPPUNIT_ASSERT(rProp.Value.get().isEmpty());
}
}
}
@@ -1367,7 +1366,7 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf78506)
if (rProp.Name == "Suffix")
// This was '0', invalid \levelnumbers wasn't ignored.
-CPPUNIT_ASSERT_EQUAL(CHAR_ZWSP,
rProp.Value.get().toChar());
+CPPUNIT_ASSERT(rProp.Value.get().isEmpty());
}
}
diff --git a/sw/source/core/doc/number.cxx b/sw/source/core/doc/number.cxx
index 481ebfada8eb..c636273e6f54 100644
--- a/sw/source/core/doc/number.cxx
+++ b/sw/source/core/doc/number.cxx
@@ -664,6 +664,13 @@ OUString SwNumRule::MakeNumString( const
SwNumberTree::tNumberVector & rNumVecto
if (nPosition >= 0)
sLevelFormat = sLevelFormat.replaceAt(nPosition,
sFind.getLength(), sReplacement);
}
+
+// As a fallback: caller code expects nonempty string as a
result.
+// But if we have empty string (and had no errors before) this
is valid result.
+// So use classical hack with zero-width-space as a string
filling.
+if (sLevelFormat.isEmpty())
+sLevelFormat = OUStringChar(CHAR_ZWSP);
+
aStr = sLevelFormat;
}
else
diff --git a/sw/source/filter/ww8/wrtw8num.cxx
b/sw/source/filter/ww8/wrtw8num.cxx
index d08a7703ce50..02695da1bc5a 100644
--- a/sw/source/filter/ww8/wrtw8num.cxx
+++ b/sw/source/filter/ww8/wr
[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - sw/source
sw/source/core/undo/undobj.cxx | 17 +++--
1 file changed, 15 insertions(+), 2 deletions(-)
New commits:
commit 34a6ca0af17deae2a3df141e214f2366955b9d68
Author: Michael Stahl
AuthorDate: Thu Jun 11 15:26:27 2020 +0200
Commit: Thorsten Behrens
CommitDate: Fri Jun 12 01:13:08 2020 +0200
tdf#132744 sw: fix subtle difference when checking end of section
In a few places, such as CopyFlyInFlyImpl() and DelFlyInRange(),
the passed start/end positions aren't necessarily from a cursor but can
be section start/end nodes instead.
(regression from 971205dc2110c1c23ff1db1fc4041e2babf6fa9f)
Change-Id: I1fb24f1f9d027aa3685ac5a7459891cb8c2b9a41
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96124
Tested-by: Jenkins
Reviewed-by: Michael Stahl
(cherry picked from commit cc4b5091e739116a7ec83513fa1cd856f0130330)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96146
Reviewed-by: Thorsten Behrens
diff --git a/sw/source/core/undo/undobj.cxx b/sw/source/core/undo/undobj.cxx
index 85b9867dd3fc..c4516f50cd66 100644
--- a/sw/source/core/undo/undobj.cxx
+++ b/sw/source/core/undo/undobj.cxx
@@ -1535,6 +1535,19 @@ static bool IsAtStartOfSection(SwPosition const&
rAnchorPos)
return node == rAnchorPos.nNode && rAnchorPos.nContent == 0;
}
+/// passed start / end position could be on section start / end node
+static bool IsAtEndOfSection2(SwPosition const& rPos)
+{
+return rPos.nNode.GetNode().IsEndNode()
+|| IsAtEndOfSection(rPos);
+}
+
+static bool IsAtStartOfSection2(SwPosition const& rPos)
+{
+return rPos.nNode.GetNode().IsStartNode()
+|| IsAtStartOfSection(rPos);
+}
+
static bool IsNotBackspaceHeuristic(
SwPosition const& rStart, SwPosition const& rEnd)
{
@@ -1576,13 +1589,13 @@ bool IsDestroyFrameAnchoredAtChar(SwPosition const &
rAnchorPos,
&& ((rStart.nNode != rEnd.nNode && rStart.nContent == 0
// but not if the selection is backspace/delete!
&& IsNotBackspaceHeuristic(rStart, rEnd))
-|| (IsAtStartOfSection(rAnchorPos) &&
IsAtEndOfSection(rEnd)
+|| (IsAtStartOfSection(rAnchorPos) &&
IsAtEndOfSection2(rEnd)
&& ((rAnchorPos < rEnd)
|| (rAnchorPos == rEnd
// special case: fully deleted node
&& ((rEnd.nNode != rStart.nNode && rEnd.nContent ==
rEnd.nNode.GetNode().GetTextNode()->Len()
&& IsNotBackspaceHeuristic(rStart, rEnd))
-|| (IsAtEndOfSection(rAnchorPos) &&
IsAtStartOfSection(rStart);
+|| (IsAtEndOfSection(rAnchorPos) &&
IsAtStartOfSection2(rStart);
}
bool IsSelectFrameAnchoredAtPara(SwPosition const & rAnchorPos,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - sw/source
sw/source/core/undo/undobj.cxx | 17 +++--
1 file changed, 15 insertions(+), 2 deletions(-)
New commits:
commit 0d97bcee3505cf70828aaf4f053c079127b7f94d
Author: Michael Stahl
AuthorDate: Thu Jun 11 15:26:27 2020 +0200
Commit: Thorsten Behrens
CommitDate: Fri Jun 12 01:13:17 2020 +0200
tdf#132744 sw: fix subtle difference when checking end of section
In a few places, such as CopyFlyInFlyImpl() and DelFlyInRange(),
the passed start/end positions aren't necessarily from a cursor but can
be section start/end nodes instead.
(regression from 971205dc2110c1c23ff1db1fc4041e2babf6fa9f)
Change-Id: I1fb24f1f9d027aa3685ac5a7459891cb8c2b9a41
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96124
Tested-by: Jenkins
Reviewed-by: Michael Stahl
(cherry picked from commit cc4b5091e739116a7ec83513fa1cd856f0130330)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96147
Reviewed-by: Thorsten Behrens
diff --git a/sw/source/core/undo/undobj.cxx b/sw/source/core/undo/undobj.cxx
index e6a6d5a509d7..eb42e7dfbc0c 100644
--- a/sw/source/core/undo/undobj.cxx
+++ b/sw/source/core/undo/undobj.cxx
@@ -1532,6 +1532,19 @@ static bool IsAtStartOfSection(SwPosition const&
rAnchorPos)
return node == rAnchorPos.nNode && rAnchorPos.nContent == 0;
}
+/// passed start / end position could be on section start / end node
+static bool IsAtEndOfSection2(SwPosition const& rPos)
+{
+return rPos.nNode.GetNode().IsEndNode()
+|| IsAtEndOfSection(rPos);
+}
+
+static bool IsAtStartOfSection2(SwPosition const& rPos)
+{
+return rPos.nNode.GetNode().IsStartNode()
+|| IsAtStartOfSection(rPos);
+}
+
static bool IsNotBackspaceHeuristic(
SwPosition const& rStart, SwPosition const& rEnd)
{
@@ -1573,13 +1586,13 @@ bool IsDestroyFrameAnchoredAtChar(SwPosition const &
rAnchorPos,
&& ((rStart.nNode != rEnd.nNode && rStart.nContent == 0
// but not if the selection is backspace/delete!
&& IsNotBackspaceHeuristic(rStart, rEnd))
-|| (IsAtStartOfSection(rAnchorPos) &&
IsAtEndOfSection(rEnd)
+|| (IsAtStartOfSection(rAnchorPos) &&
IsAtEndOfSection2(rEnd)
&& ((rAnchorPos < rEnd)
|| (rAnchorPos == rEnd
// special case: fully deleted node
&& ((rEnd.nNode != rStart.nNode && rEnd.nContent ==
rEnd.nNode.GetNode().GetTextNode()->Len()
&& IsNotBackspaceHeuristic(rStart, rEnd))
-|| (IsAtEndOfSection(rAnchorPos) &&
IsAtStartOfSection(rStart);
+|| (IsAtEndOfSection(rAnchorPos) &&
IsAtStartOfSection2(rStart);
}
bool IsSelectFrameAnchoredAtPara(SwPosition const & rAnchorPos,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - icon-themes/sukapura icon-themes/sukapura_svg
dev/null |binary icon-themes/sukapura/cmd/32/conddateformatdialog.png |binary icon-themes/sukapura/cmd/lc_conddateformatdialog.png |binary icon-themes/sukapura/res/hldoctp.png |binary icon-themes/sukapura/sc/res/lftrgt.png |binary icon-themes/sukapura/sc/res/topdown.png |binary icon-themes/sukapura/sd/res/presenterscreen-ButtonEffectNextDisabled.png |binary icon-themes/sukapura/sd/res/presenterscreen-ButtonEffectNextMouseOver.png |binary icon-themes/sukapura/sd/res/presenterscreen-ButtonEffectNextNormal.png |binary icon-themes/sukapura/sd/res/presenterscreen-ButtonEffectNextSelected.png |binary icon-themes/sukapura/sd/res/presenterscreen-ButtonSlidePreviousDisabled.png |binary icon-themes/sukapura/sd/res/presenterscreen-ButtonSlidePreviousMouseOver.png |binary icon-themes/sukapura/sd/res/presenterscreen-ButtonSlidePreviousNormal.png |binary icon-themes/sukapura/sd/res/presenterscreen-ButtonSlidePreviousSelected.png |binary icon-themes/sukapura/svx/res/fw01.png |binary icon-themes/sukapura/svx/res/fw010.png |binary icon-themes/sukapura/svx/res/fw011.png |binary icon-themes/sukapura/svx/res/fw012.png |binary icon-themes/sukapura/svx/res/fw013.png |binary icon-themes/sukapura/svx/res/fw014.png |binary icon-themes/sukapura/svx/res/fw015.png |binary icon-themes/sukapura/svx/res/fw016.png |binary icon-themes/sukapura/svx/res/fw017.png |binary icon-themes/sukapura/svx/res/fw018.png |binary icon-themes/sukapura/svx/res/fw019.png |binary icon-themes/sukapura/svx/res/fw02.png |binary icon-themes/sukapura/svx/res/fw020.png |binary icon-themes/sukapura/svx/res/fw021.png |binary icon-themes/sukapura/svx/res/fw03.png |binary icon-themes/sukapura/svx/res/fw04.png |binary icon-themes/sukapura/svx/res/fw05.png |binary icon-themes/sukapura/svx/res/fw06.png |binary icon-themes/sukapura/svx/res/fwbhcirc.png |binary icon-themes/sukapura/svx/res/fwbotarc.png |binary icon-themes/sukapura/svx/res/fwbuttn1.png |binary icon-themes/sukapura/svx/res/fwbuttn2.png |binary icon-themes/sukapura/svx/res/fwbuttn3.png |binary icon-themes/sukapura/svx/res/fwbuttn4.png |binary icon-themes/sukapura/svx/res/fwlftarc.png |binary icon-themes/sukapura/svx/res/fwlhcirc.png |binary icon-themes/sukapura/svx/res/fwrgtarc.png |binary icon-themes/sukapura/svx/res/fwrhcirc.png |binary icon-themes/sukapura/svx/res/fwtoparc.png |binary icon-themes/sukapura/svx/res/rectbtns.png |binary icon-themes/sukapura_svg/cmd/32/conddateformatdialog.svg |2 +- icon-themes/sukapura_svg/cmd/lc_conddateformatdialog.svg |2 +- icon-themes/sukapura_svg/res/hldoctp.svg |2 +- icon-themes/sukapura_svg/sc/res/lftrgt.svg |1 + icon-themes/sukapura_svg/sc/res/topdown.svg |1 + icon-themes/sukapura_svg/sd/res/presenterscreen-ButtonEffectNextDisabled.svg |1 + icon-themes/sukapura_svg/sd/res/presenterscreen-ButtonEffectNextMouseOver.svg |1 + icon-themes/sukapura_svg/sd/res/presenterscreen-ButtonEffectNextNormal.svg |1 + icon-themes/sukapura_svg/sd/res/presenterscreen-ButtonEffectNextSelected.svg |1 + icon-themes/sukapura_svg/sd/res/presenterscreen-ButtonSlideNextDisabled.svg |1 - icon-themes/sukapura_svg/sd/res/presenterscreen-ButtonSlideNextMouseOve
[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - icon-themes/colibre icon-themes/colibre_svg
icon-themes/colibre/cmd/32/decrementlevel.png |binary icon-themes/colibre/cmd/32/decrementsublevels.png |binary icon-themes/colibre/cmd/32/incrementlevel.png |binary icon-themes/colibre/cmd/32/incrementsublevels.png |binary icon-themes/colibre/cmd/32/movedown.png |binary icon-themes/colibre/cmd/32/movedownsubitems.png |binary icon-themes/colibre/cmd/32/moveup.png |binary icon-themes/colibre/cmd/32/moveupsubitems.png |binary icon-themes/colibre/cmd/lc_decrementlevel.png |binary icon-themes/colibre/cmd/lc_decrementsublevels.png |binary icon-themes/colibre/cmd/lc_incrementlevel.png |binary icon-themes/colibre/cmd/lc_incrementsublevels.png |binary icon-themes/colibre/cmd/lc_movedown.png |binary icon-themes/colibre/cmd/lc_movedownsubitems.png |binary icon-themes/colibre/cmd/lc_moveup.png |binary icon-themes/colibre/cmd/lc_moveupsubitems.png |binary icon-themes/colibre/cmd/sc_decrementlevel.png |binary icon-themes/colibre/cmd/sc_decrementsublevels.png |binary icon-themes/colibre/cmd/sc_incrementlevel.png |binary icon-themes/colibre/cmd/sc_incrementsublevels.png |binary icon-themes/colibre/cmd/sc_movedown.png |binary icon-themes/colibre/cmd/sc_movedownsubitems.png |binary icon-themes/colibre/cmd/sc_moveup.png |binary icon-themes/colibre/cmd/sc_moveupsubitems.png |binary icon-themes/colibre_svg/cmd/32/decrementlevel.svg |2 +- icon-themes/colibre_svg/cmd/32/decrementsublevels.svg |2 +- icon-themes/colibre_svg/cmd/32/incrementlevel.svg |2 +- icon-themes/colibre_svg/cmd/32/incrementsublevels.svg |2 +- icon-themes/colibre_svg/cmd/32/movedown.svg |2 +- icon-themes/colibre_svg/cmd/32/movedownsubitems.svg |2 +- icon-themes/colibre_svg/cmd/32/moveup.svg |2 +- icon-themes/colibre_svg/cmd/32/moveupsubitems.svg |2 +- icon-themes/colibre_svg/cmd/lc_decrementlevel.svg |2 +- icon-themes/colibre_svg/cmd/lc_decrementsublevels.svg |2 +- icon-themes/colibre_svg/cmd/lc_incrementlevel.svg |2 +- icon-themes/colibre_svg/cmd/lc_incrementsublevels.svg |2 +- icon-themes/colibre_svg/cmd/lc_movedown.svg |2 +- icon-themes/colibre_svg/cmd/lc_movedownsubitems.svg |2 +- icon-themes/colibre_svg/cmd/lc_moveup.svg |2 +- icon-themes/colibre_svg/cmd/lc_moveupsubitems.svg |2 +- icon-themes/colibre_svg/cmd/sc_decrementlevel.svg |2 +- icon-themes/colibre_svg/cmd/sc_decrementsublevels.svg |2 +- icon-themes/colibre_svg/cmd/sc_incrementlevel.svg |1 + icon-themes/colibre_svg/cmd/sc_incrementsublevels.svg |2 +- icon-themes/colibre_svg/cmd/sc_movedown.svg |2 +- icon-themes/colibre_svg/cmd/sc_movedownsubitems.svg |2 +- icon-themes/colibre_svg/cmd/sc_moveup.svg |2 +- icon-themes/colibre_svg/cmd/sc_moveupsubitems.svg |2 +- 48 files changed, 24 insertions(+), 23 deletions(-) New commits: commit ad685e0443f65d4c4ea1b85b67d14c8aa41d4a03 Author: Rizal Muttaqin AuthorDate: Thu Jun 11 22:57:28 2020 +0700 Commit: Rizal Muttaqin CommitDate: Fri Jun 12 00:24:42 2020 +0200 tdf#126122 differentiate between indent and promote icons Change-Id: Ib0e0296bba69df2b7079df54fb74bcedfb6b1415 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96160 Tested-by: Jenkins Reviewed-by: Rizal Muttaqin (cherry picked from commit 13687299774377427f24a47fc8e54ae712a8a242) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96175 diff --git a/icon-themes/colibre/cmd/32/decrementlevel.png b/icon-themes/colibre/cmd/32/decrementlevel.png index 5d28f81712df..45067c2e2212 100644 Binary files a/icon-themes/colibre/cmd/32/decrementlevel.png and b/icon-themes/colibre/cmd/32/decrementlevel.png differ diff --git a/icon-themes/colibre/cmd/32/decrementsublevels.png b/icon-themes/colibre/cmd/32/decrementsublevels.png index 022fe9edd353..cbf6fc78b37c 100644 Binary files a/icon-themes/colibre/cmd/32/decrementsublevels.png and b/icon-themes/colibre/cmd/32/decrementsublevels.png differ diff --git a/icon-themes/colibre/cmd/32/incrementlevel.png b/icon-themes/colibre/cmd/32/incrementlevel.png index a1ef38677742..886b4549a7b6 100644 Binary files a/icon-themes/colibre/cmd/32/incrementlevel.png and b/icon-themes/colibre/cmd/32/incrementlevel.png differ diff --git a/icon-themes/colibre/cmd/32/incrementsublevels.png b/icon-themes/colibre/cmd/32/incrementsublevels.png index 3c435f65f67c..0e05b3c390fd 100644 Binary files a/icon-themes/colibre/cmd/32/incrementsublevels.png and b/icon-themes/colibre/cmd/32/incrementsublevels.png differ diff --git a/icon-themes/colibre/cmd/32/movedown.png b/icon-themes/colibre/cmd/32/movedown.png index 5440e1b4b595..55a499f78fe0 100644 Binary files a/icon-themes/colibre/cmd/32/move
[Libreoffice-commits] core.git: icon-themes/sukapura icon-themes/sukapura_svg
dev/null |binary icon-themes/sukapura/cmd/32/conddateformatdialog.png |binary icon-themes/sukapura/cmd/lc_conddateformatdialog.png |binary icon-themes/sukapura/res/hldoctp.png |binary icon-themes/sukapura/sc/res/lftrgt.png |binary icon-themes/sukapura/sc/res/topdown.png |binary icon-themes/sukapura/sd/res/presenterscreen-ButtonEffectNextDisabled.png |binary icon-themes/sukapura/sd/res/presenterscreen-ButtonEffectNextMouseOver.png |binary icon-themes/sukapura/sd/res/presenterscreen-ButtonEffectNextNormal.png |binary icon-themes/sukapura/sd/res/presenterscreen-ButtonEffectNextSelected.png |binary icon-themes/sukapura/sd/res/presenterscreen-ButtonSlidePreviousDisabled.png |binary icon-themes/sukapura/sd/res/presenterscreen-ButtonSlidePreviousMouseOver.png |binary icon-themes/sukapura/sd/res/presenterscreen-ButtonSlidePreviousNormal.png |binary icon-themes/sukapura/sd/res/presenterscreen-ButtonSlidePreviousSelected.png |binary icon-themes/sukapura/svx/res/fw01.png |binary icon-themes/sukapura/svx/res/fw010.png |binary icon-themes/sukapura/svx/res/fw011.png |binary icon-themes/sukapura/svx/res/fw012.png |binary icon-themes/sukapura/svx/res/fw013.png |binary icon-themes/sukapura/svx/res/fw014.png |binary icon-themes/sukapura/svx/res/fw015.png |binary icon-themes/sukapura/svx/res/fw016.png |binary icon-themes/sukapura/svx/res/fw017.png |binary icon-themes/sukapura/svx/res/fw018.png |binary icon-themes/sukapura/svx/res/fw019.png |binary icon-themes/sukapura/svx/res/fw02.png |binary icon-themes/sukapura/svx/res/fw020.png |binary icon-themes/sukapura/svx/res/fw021.png |binary icon-themes/sukapura/svx/res/fw03.png |binary icon-themes/sukapura/svx/res/fw04.png |binary icon-themes/sukapura/svx/res/fw05.png |binary icon-themes/sukapura/svx/res/fw06.png |binary icon-themes/sukapura/svx/res/fwbhcirc.png |binary icon-themes/sukapura/svx/res/fwbotarc.png |binary icon-themes/sukapura/svx/res/fwbuttn1.png |binary icon-themes/sukapura/svx/res/fwbuttn2.png |binary icon-themes/sukapura/svx/res/fwbuttn3.png |binary icon-themes/sukapura/svx/res/fwbuttn4.png |binary icon-themes/sukapura/svx/res/fwlftarc.png |binary icon-themes/sukapura/svx/res/fwlhcirc.png |binary icon-themes/sukapura/svx/res/fwrgtarc.png |binary icon-themes/sukapura/svx/res/fwrhcirc.png |binary icon-themes/sukapura/svx/res/fwtoparc.png |binary icon-themes/sukapura/svx/res/rectbtns.png |binary icon-themes/sukapura_svg/cmd/32/conddateformatdialog.svg |2 +- icon-themes/sukapura_svg/cmd/lc_conddateformatdialog.svg |2 +- icon-themes/sukapura_svg/res/hldoctp.svg |2 +- icon-themes/sukapura_svg/sc/res/lftrgt.svg |1 + icon-themes/sukapura_svg/sc/res/topdown.svg |1 + icon-themes/sukapura_svg/sd/res/presenterscreen-ButtonEffectNextDisabled.svg |1 + icon-themes/sukapura_svg/sd/res/presenterscreen-ButtonEffectNextMouseOver.svg |1 + icon-themes/sukapura_svg/sd/res/presenterscreen-ButtonEffectNextNormal.svg |1 + icon-themes/sukapura_svg/sd/res/presenterscreen-ButtonEffectNextSelected.svg |1 + icon-themes/sukapura_svg/sd/res/presenterscreen-ButtonSlideNextDisabled.svg |1 - icon-themes/sukapura_svg/sd/res/presenterscreen-ButtonSlideNextMouseOve
[Libreoffice-commits] core.git: icon-themes/colibre icon-themes/colibre_svg
icon-themes/colibre/cmd/32/decrementlevel.png |binary icon-themes/colibre/cmd/32/decrementsublevels.png |binary icon-themes/colibre/cmd/32/incrementlevel.png |binary icon-themes/colibre/cmd/32/incrementsublevels.png |binary icon-themes/colibre/cmd/32/movedown.png |binary icon-themes/colibre/cmd/32/movedownsubitems.png |binary icon-themes/colibre/cmd/32/moveup.png |binary icon-themes/colibre/cmd/32/moveupsubitems.png |binary icon-themes/colibre/cmd/lc_decrementlevel.png |binary icon-themes/colibre/cmd/lc_decrementsublevels.png |binary icon-themes/colibre/cmd/lc_incrementlevel.png |binary icon-themes/colibre/cmd/lc_incrementsublevels.png |binary icon-themes/colibre/cmd/lc_movedown.png |binary icon-themes/colibre/cmd/lc_movedownsubitems.png |binary icon-themes/colibre/cmd/lc_moveup.png |binary icon-themes/colibre/cmd/lc_moveupsubitems.png |binary icon-themes/colibre/cmd/sc_decrementlevel.png |binary icon-themes/colibre/cmd/sc_decrementsublevels.png |binary icon-themes/colibre/cmd/sc_incrementlevel.png |binary icon-themes/colibre/cmd/sc_incrementsublevels.png |binary icon-themes/colibre/cmd/sc_movedown.png |binary icon-themes/colibre/cmd/sc_movedownsubitems.png |binary icon-themes/colibre/cmd/sc_moveup.png |binary icon-themes/colibre/cmd/sc_moveupsubitems.png |binary icon-themes/colibre_svg/cmd/32/decrementlevel.svg |2 +- icon-themes/colibre_svg/cmd/32/decrementsublevels.svg |2 +- icon-themes/colibre_svg/cmd/32/incrementlevel.svg |2 +- icon-themes/colibre_svg/cmd/32/incrementsublevels.svg |2 +- icon-themes/colibre_svg/cmd/32/movedown.svg |2 +- icon-themes/colibre_svg/cmd/32/movedownsubitems.svg |2 +- icon-themes/colibre_svg/cmd/32/moveup.svg |2 +- icon-themes/colibre_svg/cmd/32/moveupsubitems.svg |2 +- icon-themes/colibre_svg/cmd/lc_decrementlevel.svg |2 +- icon-themes/colibre_svg/cmd/lc_decrementsublevels.svg |2 +- icon-themes/colibre_svg/cmd/lc_incrementlevel.svg |2 +- icon-themes/colibre_svg/cmd/lc_incrementsublevels.svg |2 +- icon-themes/colibre_svg/cmd/lc_movedown.svg |2 +- icon-themes/colibre_svg/cmd/lc_movedownsubitems.svg |2 +- icon-themes/colibre_svg/cmd/lc_moveup.svg |2 +- icon-themes/colibre_svg/cmd/lc_moveupsubitems.svg |2 +- icon-themes/colibre_svg/cmd/sc_decrementlevel.svg |2 +- icon-themes/colibre_svg/cmd/sc_decrementsublevels.svg |2 +- icon-themes/colibre_svg/cmd/sc_incrementlevel.svg |1 + icon-themes/colibre_svg/cmd/sc_incrementsublevels.svg |2 +- icon-themes/colibre_svg/cmd/sc_movedown.svg |2 +- icon-themes/colibre_svg/cmd/sc_movedownsubitems.svg |2 +- icon-themes/colibre_svg/cmd/sc_moveup.svg |2 +- icon-themes/colibre_svg/cmd/sc_moveupsubitems.svg |2 +- 48 files changed, 24 insertions(+), 23 deletions(-) New commits: commit 444a41bf9525193bb1598eb8d0cdd4aaa2137c8b Author: Rizal Muttaqin AuthorDate: Thu Jun 11 22:57:28 2020 +0700 Commit: Rizal Muttaqin CommitDate: Thu Jun 11 23:39:13 2020 +0200 tdf#126122 differentiate between indent and promote icons Change-Id: Ib0e0296bba69df2b7079df54fb74bcedfb6b1415 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96160 Tested-by: Jenkins Reviewed-by: Rizal Muttaqin diff --git a/icon-themes/colibre/cmd/32/decrementlevel.png b/icon-themes/colibre/cmd/32/decrementlevel.png index 5d28f81712df..45067c2e2212 100644 Binary files a/icon-themes/colibre/cmd/32/decrementlevel.png and b/icon-themes/colibre/cmd/32/decrementlevel.png differ diff --git a/icon-themes/colibre/cmd/32/decrementsublevels.png b/icon-themes/colibre/cmd/32/decrementsublevels.png index 022fe9edd353..cbf6fc78b37c 100644 Binary files a/icon-themes/colibre/cmd/32/decrementsublevels.png and b/icon-themes/colibre/cmd/32/decrementsublevels.png differ diff --git a/icon-themes/colibre/cmd/32/incrementlevel.png b/icon-themes/colibre/cmd/32/incrementlevel.png index a1ef38677742..886b4549a7b6 100644 Binary files a/icon-themes/colibre/cmd/32/incrementlevel.png and b/icon-themes/colibre/cmd/32/incrementlevel.png differ diff --git a/icon-themes/colibre/cmd/32/incrementsublevels.png b/icon-themes/colibre/cmd/32/incrementsublevels.png index 3c435f65f67c..0e05b3c390fd 100644 Binary files a/icon-themes/colibre/cmd/32/incrementsublevels.png and b/icon-themes/colibre/cmd/32/incrementsublevels.png differ diff --git a/icon-themes/colibre/cmd/32/movedown.png b/icon-themes/colibre/cmd/32/movedown.png index 5440e1b4b595..55a499f78fe0 100644 Binary files a/icon-themes/colibre/cmd/32/movedown.png and b/icon-themes/colibre/cmd/32/movedown.png differ diff --git a/icon-themes/colibre/cmd/32/movedownsubitems.png b/icon-them
[Libreoffice-commits] core.git: include/xmloff sw/qa xmloff/source
include/xmloff/xmlnumfi.hxx |2 ++
sw/qa/extras/odfimport/data/tdf133459.odt |binary
sw/qa/extras/odfimport/odfimport.cxx | 30 ++
xmloff/source/core/xmlimp.cxx |5 +++--
xmloff/source/style/xmlnumfi.cxx | 16 ++--
5 files changed, 49 insertions(+), 4 deletions(-)
New commits:
commit cd0dc1bc592d7952c36659da33d99ab964fe2e93
Author: Maxim Monastirsky
AuthorDate: Wed Jun 10 22:01:24 2020 +0300
Commit: Maxim Monastirsky
CommitDate: Thu Jun 11 23:07:46 2020 +0200
tdf#133459 Fix import of fields with user defined number formats
commit 59ace23c367f83491a37e844d16f7d716eff6346 ("tdf#101710 Fix
invalid style:data-style-name attribute") had a side effect of
exporting user defined number formats under instead
of under (which is valid, and what Calc
does since forever). As it turned out, this didn't work well for
fields:
- For fields inside headers or footers, their number format wasn't
imported at all. The reason here is that fields use the
XMLTextImportHelper::GetDataStyleKey method to resolve data styles,
and that method checks only automatic styles. Actually it resolves
also styles from , because SvXMLImport::SetAutoStyles
has a special code that merges styles from into
automatic styles during content.xml reading. The problem is that
headers and footers have their contents stored inside styles.xml,
and no merging happens at this stage (unless it's a flat odf file).
One way to solve this could be to explicitly check for styles from
in XMLTextImportHelper::GetDataStyleKey (e.g. see
previous gerrit patchsets, or XMLTableStyleContext::GetNumberFormat)
I chose to simply modify the condition in SvXMLImport::SetAutoStyles,
so that merging happens anyway.
- Fields whose format resolution depends on the merging of
SvXMLImport::SetAutoStyles, did import the number format itself,
but not its language setting. This can be in one of three ways:
(a) Fields in the document and the header, when both use the same
format. In this case the format is stored once in styles.xml, so
at least the consumer from content.xml depends on merging.
(b) Field in the document with a user defined format - a regression
of the above commit. Now stored in styles.xml under
instead of in content.xml under .
(c) Field in a header with a user defined format - depends
on merging as a result of the above fix.
The reason here is that the merging isn't done with the original
SvXMLNumFormatContext objects, but with a newly created fake ones,
which only have the format id correct (with the assumption that
those formats already imported, and calling code could just find
them by the id). The problem is that the fields code uses
XMLTextImportHelper::GetDataStyleKey to get the language setting
from style objects, and set the IsFixedLanguage property according
to it, while we know that those fake objects don't have the
language correctly set. Try to fix that problem by setting the
correct language on those fake objects.
Change-Id: Ibb362df019921e040708d3bda83bf155535ec7af
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95612
Tested-by: Jenkins
Reviewed-by: Maxim Monastirsky
diff --git a/include/xmloff/xmlnumfi.hxx b/include/xmloff/xmlnumfi.hxx
index 21eac93a3cd9..b337fad36832 100644
--- a/include/xmloff/xmlnumfi.hxx
+++ b/include/xmloff/xmlnumfi.hxx
@@ -91,6 +91,7 @@ public:
SvXMLNumImpData* getData() { return pData.get(); }
const SvXMLTokenMap&GetStylesElemTokenMap();
+LanguageTypeGetLanguageForKey(sal_Int32 nKey);
// sal_uInt32 GetKeyForName( const OUString& rName );
};
@@ -164,6 +165,7 @@ public:
const OUString& rLName,
const css::uno::Reference<
css::xml::sax::XAttributeList>& xAttrList,
const sal_Int32 nKey,
+LanguageType nLang,
SvXMLStylesContext& rStyles );
virtual ~SvXMLNumFormatContext() override;
diff --git a/sw/qa/extras/odfimport/data/tdf133459.odt
b/sw/qa/extras/odfimport/data/tdf133459.odt
new file mode 100644
index ..9468d7918a6c
Binary files /dev/null and b/sw/qa/extras/odfimport/data/tdf133459.odt differ
diff --git a/sw/qa/extras/odfimport/odfimport.cxx
b/sw/qa/extras/odfimport/odfimport.cxx
index 30737c3454dd..70d5a158b22c 100644
--- a/sw/qa/extras/odfimport/odfimport.cxx
+++ b/sw/qa/extras/odfimport/odfimport.cxx
@@ -30,6 +30,9 @@
#include
#include
#include
+#include
+#include
+#include
#include
#include
@@ -1048,5 +1051,32 @@ DECLARE_ODFIMPORT_TEST(testTdf123968, "tdf123968.odt")
rStart.GetText());
}
+DECLARE_ODFIMPORT_TEST(testTdf133459
[Libreoffice-commits] online.git: .gitignore loleaflet/Makefile.am
.gitignore|4 ++-- loleaflet/Makefile.am |2 +- 2 files changed, 3 insertions(+), 3 deletions(-) New commits: commit 38715ea2df484872b3af56e30c5ab8f021c1c4c9 Author: Henry Castro AuthorDate: Tue Jun 2 10:26:34 2020 -0400 Commit: Henry Castro CommitDate: Thu Jun 11 22:05:02 2020 +0200 android: create intermediate dir for build variants It is better to separate the intermediate asset files Change-Id: I50ff1b6e045679afa48c7024652de40db8fa2a71 Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95366 Tested-by: Jenkins Tested-by: Jenkins CollaboraOffice Reviewed-by: Henry Castro diff --git a/.gitignore b/.gitignore index 4537a7669..c2281c7ba 100644 --- a/.gitignore +++ b/.gitignore @@ -56,8 +56,8 @@ loolwsd.log *.mo # loleaflet -loleaflet/build -loleaflet/dist +loleaflet/debug +loleaflet/release loleaflet/npm-shrinkwrap.json loleaflet/jsconfig.json loleaflet/admin/jsconfig.json diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am index 94269517b..9d9c991e6 100644 --- a/loleaflet/Makefile.am +++ b/loleaflet/Makefile.am @@ -322,7 +322,7 @@ COMMA := , EMPTY := SPACE := $(EMPTY) $(EMPTY) LOLEAFLET_VERSION = $(shell cd $(srcdir) && git log -1 --pretty=format:"%h") -INTERMEDIATE_DIR ?= $(abs_builddir)/build +INTERMEDIATE_DIR ?= $(if $(IS_DEBUG),$(abs_builddir)/debug,$(abs_builddir)/release) EXTRA_DIST = $(shell find . -type f -not -path './.git/*' | sed 's/.\///') ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: android/build.gradle.in android/.gitignore android/lib
android/.gitignore |3 +++
android/build.gradle.in |4
android/lib/build.gradle |2 ++
3 files changed, 9 insertions(+)
New commits:
commit e7c75fda31606834af666588bb52877cdcfe38db
Author: Henry Castro
AuthorDate: Mon Jun 1 17:40:21 2020 -0400
Commit: Henry Castro
CommitDate: Thu Jun 11 21:34:21 2020 +0200
android: clean debug and release assets
Change-Id: I3e6c53f6d82169ba5a529a63bae9256fb43d69ed
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95332
Tested-by: Jenkins CollaboraOffice
Tested-by: Jenkins
Reviewed-by: Henry Castro
diff --git a/android/.gitignore b/android/.gitignore
index afb2ba6d8..70c5f8390 100644
--- a/android/.gitignore
+++ b/android/.gitignore
@@ -1,5 +1,6 @@
.gradle
.idea
+/build
/android.iml
/build.gradle
/local.properties
@@ -12,4 +13,6 @@
/lib/src/main/assets/share/
/lib/src/main/assets/unpack/
/lib/src/main/assets/user/
+/lib/src/debug/assets
+/lib/src/release/assets
/lib/src/main/cpp/lib
diff --git a/android/build.gradle.in b/android/build.gradle.in
index 5b78812cb..fd2b2fc5e 100644
--- a/android/build.gradle.in
+++ b/android/build.gradle.in
@@ -24,3 +24,7 @@ allprojects {
task clean(type: Delete) {
delete rootProject.buildDir
}
+
+afterEvaluate {
+clean.dependsOn(':lib:clean')
+}
diff --git a/android/lib/build.gradle b/android/lib/build.gradle
index 1b1eb90df..c3b3621b9 100644
--- a/android/lib/build.gradle
+++ b/android/lib/build.gradle
@@ -291,6 +291,8 @@ ReferenceOOoMajorMinor=4.1
clean.doFirst {
delete "src/main/assets"
+ delete "src/debug/assets"
+ delete "src/release/assets"
}
// creating the UI stuff is cheap, don't bother only applying it for the
flavor..
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: cypress_test/integration_tests cypress_test/plugins
cypress_test/integration_tests/desktop/calc/focus_spec.js |6 ++
cypress_test/plugins/blacklists.js|3 ---
2 files changed, 6 insertions(+), 3 deletions(-)
New commits:
commit c0e7b862da688d1f99dd88dc0e6229de9967008b
Author: Tamás Zolnai
AuthorDate: Thu Jun 11 20:55:21 2020 +0200
Commit: Tamás Zolnai
CommitDate: Thu Jun 11 21:24:36 2020 +0200
cypress: update desktop/calc/focus_spec.js
Clicking on the formulabar is not a reliable way to move
the cursor to a specific text position.
Change-Id: I9ea48f4591707531a3dfdfb02b18d6fcb08921a6
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/96163
Tested-by: Jenkins CollaboraOffice
Tested-by: Jenkins
Reviewed-by: Tamás Zolnai
diff --git a/cypress_test/integration_tests/desktop/calc/focus_spec.js
b/cypress_test/integration_tests/desktop/calc/focus_spec.js
index 0c1da24c5..7e27890b7 100644
--- a/cypress_test/integration_tests/desktop/calc/focus_spec.js
+++ b/cypress_test/integration_tests/desktop/calc/focus_spec.js
@@ -60,6 +60,12 @@ describe('Calc focus tests', function() {
calcHelper.clickOnFirstCell();
calcHelper.clickFormulaBar();
helper.assertCursorAndFocus();
+
+ // Move cursor before text2
+ cy.get('textarea.clipboard').type('{end}');
+ for (var i = 0; i < 6; i++)
+ cy.get('textarea.clipboard').type('{leftarrow}');
+
var text3 = ' BAZINGA';
helper.typeText('textarea.clipboard', text3);
// Validate.
diff --git a/cypress_test/plugins/blacklists.js
b/cypress_test/plugins/blacklists.js
index 00f8175f5..afbda2c26 100644
--- a/cypress_test/plugins/blacklists.js
+++ b/cypress_test/plugins/blacklists.js
@@ -44,9 +44,6 @@ var testBlackLists = {
],
'cp-6-4': [
- ['desktop/calc/focus_spec.js',
- []
- ],
['mobile/calc/apply_font_spec.js',
[
'Apply font size.'
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: android/app android/lib loleaflet/Makefile.am
android/app/build.gradle |6 --
android/lib/build.gradle | 12 ++--
loleaflet/Makefile.am| 12
3 files changed, 14 insertions(+), 16 deletions(-)
New commits:
commit 132bef2a972647b310fbf88a5e97b0789ad1ce14
Author: Henry Castro
AuthorDate: Wed May 27 12:43:29 2020 -0400
Commit: Henry Castro
CommitDate: Thu Jun 11 21:00:45 2020 +0200
android: generate debug and release loleaflet assets
Change-Id: If3659de771b3d1f7015c1e4c26d6877f90afe306
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/94996
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Henry Castro
diff --git a/android/app/build.gradle b/android/app/build.gradle
index 1b4848bd0..3d364a40e 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -83,16 +83,10 @@ task copyBrandFiles(type: Copy) {
into "src/main/res"
}
-task generateLoleafletAssets(type: Exec) {
- commandLine 'make', '-C', '../../'
-}
-
afterEvaluate {
if (!project.ext.liboHasBranding.equals("true") ||
!file("${liboBrandingDir}").exists()) {
copyBrandFiles.enabled = false
}
preBuild.dependsOn copyBrandFiles
- generateDebugAssets.dependsOn generateLoleafletAssets
- generateReleaseAssets.dependsOn generateLoleafletAssets
}
diff --git a/android/lib/build.gradle b/android/lib/build.gradle
index 50cb2fc43..1b1eb90df 100644
--- a/android/lib/build.gradle
+++ b/android/lib/build.gradle
@@ -298,10 +298,18 @@ preBuild.dependsOn 'createRCfiles',
'createFullConfig',
'copyBrandTheme'
+task generateLoleafletDebugAssets(type: Exec) {
+ commandLine 'make', '-C', '../../',
"DIST_FOLDER=${project.getProjectDir()}/src/debug/assets/dist", 'BUNDLE=DEBUG'
+}
+
+task generateLoleafletReleaseAssets(type: Exec) {
+ commandLine 'make', '-C', '../../',
"DIST_FOLDER=${project.getProjectDir()}/src/release/assets/dist",
'BUNDLE=RELEASE'
+}
+
afterEvaluate {
if (!file("${liboBrandingDir}").exists()) {
copyBrandTheme.enabled = false
}
- generateDebugAssets.dependsOn copyDocTemplates, copyKitConfig
- generateReleaseAssets.dependsOn copyDocTemplates, copyKitConfig
+ generateDebugAssets.dependsOn copyDocTemplates, copyKitConfig,
generateLoleafletDebugAssets
+ generateReleaseAssets.dependsOn copyDocTemplates, copyKitConfig,
generateLoleafletReleaseAssets
}
diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index b79a89f00..94269517b 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -5,11 +5,7 @@ L10N_PO = $(wildcard $(srcdir)/po/*.po)
BUNDLE ?= $(if $(filter true,$(ENABLE_DEBUG)),DEBUG,RELEASE)
IS_DEBUG = $(if $(filter DEBUG,$(BUNDLE)),true,)
-if ENABLE_ANDROIDAPP
-DIST_FOLDER = $(abs_top_srcdir)/android/lib/src/main/assets/dist
-else
-DIST_FOLDER = $(builddir)/dist
-endif
+DIST_FOLDER ?= $(builddir)/dist
export NODE_PATH=$(abs_builddir)/node_module
@@ -412,9 +408,9 @@ build-loleaflet: compilets \
$(DIST_FOLDER)/loleaflet.html
@echo "build loleaflet completed"
if ENABLE_ANDROIDAPP
- @if test -d "$(APP_BRANDING_DIR)" ; then cp -a
"$(APP_BRANDING_DIR)/branding.css" "$(APP_BRANDING_DIR)/branding.js"
$(abs_top_srcdir)/android/lib/src/main/assets/dist/ ; else touch
$(abs_top_srcdir)/android/lib/src/main/assets/dist/branding.css ; fi
- @if test -d "$(APP_BRANDING_DIR)" ; then cp -a
"$(APP_BRANDING_DIR)"/images/*.svg
$(abs_top_srcdir)/android/lib/src/main/assets/dist/images/ ; fi
- @if test -d "$(APP_BRANDING_DIR)" ; then cp -a
"$(APP_BRANDING_DIR)/images/toolbar-bg-logo.svg"
$(abs_top_srcdir)/android/lib/src/main/assets/dist/images/toolbar-bg.svg ; fi
+ @if test -d "$(APP_BRANDING_DIR)" ; then cp -a
"$(APP_BRANDING_DIR)/branding.css" "$(APP_BRANDING_DIR)/branding.js"
$(DIST_FOLDER)/ ; else touch $(DIST_FOLDER)/branding.css ; fi
+ @if test -d "$(APP_BRANDING_DIR)" ; then cp -a
"$(APP_BRANDING_DIR)"/images/*.svg $(DIST_FOLDER)/images/ ; fi
+ @if test -d "$(APP_BRANDING_DIR)" ; then cp -a
"$(APP_BRANDING_DIR)/images/toolbar-bg-logo.svg"
$(DIST_FOLDER)/images/toolbar-bg.svg ; fi
@echo
@echo "JS, HTML and CSS has been updated
(android/lib/src/main/assets/dist)."
endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: wsd/RequestDetails.cpp wsd/RequestDetails.hpp
wsd/RequestDetails.cpp | 30 +-
wsd/RequestDetails.hpp |2 ++
2 files changed, 19 insertions(+), 13 deletions(-)
New commits:
commit 9928143e05099dc968a22b216aa59a60a2e16ab5
Author: Henry Castro
AuthorDate: Fri Jun 5 11:19:58 2020 -0400
Commit: Henry Castro
CommitDate: Thu Jun 11 20:41:36 2020 +0200
android: fix invalid URI when running x86_64
Change-Id: If057df24de63759d3e239475ecca94f8faaa0d35
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95611
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Henry Castro
diff --git a/wsd/RequestDetails.cpp b/wsd/RequestDetails.cpp
index f89745abb..9caf03f29 100644
--- a/wsd/RequestDetails.cpp
+++ b/wsd/RequestDetails.cpp
@@ -68,6 +68,23 @@ RequestDetails::RequestDetails(Poco::Net::HTTPRequest
&request, const std::strin
_hostUntrusted = request.getHost();
#endif
+processURI();
+}
+
+RequestDetails::RequestDetails(const std::string &mobileURI)
+: _isGet(true)
+, _isHead(false)
+, _isProxy(false)
+, _isWebSocket(false)
+{
+_isMobile = true;
+_uriString = mobileURI;
+
+processURI();
+}
+
+void RequestDetails::processURI()
+{
// Poco::SyntaxException is thrown when the syntax is invalid.
Poco::URI uri(_uriString);
for (const auto& param : uri.getQueryParameters())
@@ -179,17 +196,4 @@ RequestDetails::RequestDetails(Poco::Net::HTTPRequest
&request, const std::strin
}
}
-RequestDetails::RequestDetails(const std::string &mobileURI)
-: _isGet(true)
-, _isHead(false)
-, _isProxy(false)
-, _isWebSocket(false)
-{
-_isMobile = true;
-_uriString = mobileURI;
-// Not sure if these are correct in the case of file names that need
URI-encoding.
-_fields[Field::LegacyDocumentURI] = _uriString;
-_fields[Field::DocumentURI] = _uriString;
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/wsd/RequestDetails.hpp b/wsd/RequestDetails.hpp
index 695db11cc..e55f28535 100644
--- a/wsd/RequestDetails.hpp
+++ b/wsd/RequestDetails.hpp
@@ -120,6 +120,8 @@ private:
std::map _params;
std::map _fields;
+void processURI();
+
public:
RequestDetails(Poco::Net::HTTPRequest &request, const std::string&
serviceRoot);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa
sw/qa/extras/uiwriter/data3/tdf132725.odt |binary
sw/qa/extras/uiwriter/uiwriter3.cxx | 42 ++
2 files changed, 42 insertions(+)
New commits:
commit cd47dba9aa4b91bb0edf0744561d29e2eef61cc9
Author: Xisco Fauli
AuthorDate: Thu Jun 11 14:56:19 2020 +0200
Commit: Xisco Fauli
CommitDate: Thu Jun 11 20:35:35 2020 +0200
tdf#132725: sw: Add unittest
Change-Id: I3d4405dbe77d9f4d9bece8023cc01a7fa0ac463c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96122
Tested-by: Jenkins
Reviewed-by: Xisco Fauli
diff --git a/sw/qa/extras/uiwriter/data3/tdf132725.odt
b/sw/qa/extras/uiwriter/data3/tdf132725.odt
new file mode 100644
index ..b14fc20486ea
Binary files /dev/null and b/sw/qa/extras/uiwriter/data3/tdf132725.odt differ
diff --git a/sw/qa/extras/uiwriter/uiwriter3.cxx
b/sw/qa/extras/uiwriter/uiwriter3.cxx
index 8668749f134d..2dbc522a59a3 100644
--- a/sw/qa/extras/uiwriter/uiwriter3.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter3.cxx
@@ -234,6 +234,48 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf76636_2)
CPPUNIT_ASSERT_EQUAL(sal_Int32(6), xTextTable->getColumns()->getCount());
}
+CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf132725)
+{
+load(DATA_DIRECTORY, "tdf132725.odt");
+
+SwXTextDocument* pTextDoc =
dynamic_cast(mxComponent.get());
+CPPUNIT_ASSERT(pTextDoc);
+
+CPPUNIT_ASSERT_EQUAL(1, getShapes());
+CPPUNIT_ASSERT_EQUAL(OUString("AA"), getParagraph(1)->getString());
+
+dispatchCommand(mxComponent, ".uno:GoToEndOfPara", {});
+Scheduler::ProcessEventsToIdle();
+
+dispatchCommand(mxComponent, ".uno:SwBackspace", {});
+dispatchCommand(mxComponent, ".uno:SwBackspace", {});
+Scheduler::ProcessEventsToIdle();
+
+CPPUNIT_ASSERT_EQUAL(0, getShapes());
+CPPUNIT_ASSERT_EQUAL(OUString(""), getParagraph(1)->getString());
+
+dispatchCommand(mxComponent, ".uno:Undo", {});
+dispatchCommand(mxComponent, ".uno:Undo", {});
+Scheduler::ProcessEventsToIdle();
+
+CPPUNIT_ASSERT_EQUAL(1, getShapes());
+CPPUNIT_ASSERT_EQUAL(OUString("AA"), getParagraph(1)->getString());
+
+dispatchCommand(mxComponent, ".uno:Redo", {});
+dispatchCommand(mxComponent, ".uno:Redo", {});
+Scheduler::ProcessEventsToIdle();
+
+CPPUNIT_ASSERT_EQUAL(0, getShapes());
+CPPUNIT_ASSERT_EQUAL(OUString(""), getParagraph(1)->getString());
+
+//Without the fix in place, it would crash here
+dispatchCommand(mxComponent, ".uno:Undo", {});
+Scheduler::ProcessEventsToIdle();
+
+CPPUNIT_ASSERT_EQUAL(1, getShapes());
+CPPUNIT_ASSERT_EQUAL(OUString("A"), getParagraph(1)->getString());
+}
+
CPPUNIT_TEST_FIXTURE(SwUiWriterTest3, testTdf126340)
{
load(DATA_DIRECTORY, "tdf126340.odt");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: help3xsl/help2.js
help3xsl/help2.js |9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
New commits:
commit 7c55241a443bdbfaa46613ddd456edfeb9f5e1b3
Author: Olivier Hallot
AuthorDate: Thu Jun 11 15:31:59 2020 -0300
Commit: Olivier Hallot
CommitDate: Thu Jun 11 20:34:27 2020 +0200
Fix applicaiton color and h1 underline CSS
Change-Id: Ia8a18f4a8e1bd12c40a092528e68ec2f12846ac1
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/96162
Tested-by: Jenkins
Reviewed-by: Olivier Hallot
diff --git a/help3xsl/help2.js b/help3xsl/help2.js
index 382627d83..95635c846 100644
--- a/help3xsl/help2.js
+++ b/help3xsl/help2.js
@@ -73,8 +73,8 @@ function moduleColor (module) {
case "WRITER" : {color="#0369A3"; break;}
case "CALC" : {color="#43C330"; break;}
case "CHART" : {color="darkcyan"; break;}
-case "DRAW" : {color="#A33E03"; break;}
-case "IMPRESS": {color="#C99C00"; break;}
+case "IMPRESS": {color="#A33E03"; break;}
+case "DRAW" : {color="#C99C00"; break;}
case "BASE" : {color="#8E03A3"; break;}
case "BASIC" : {color="black"; break;}
case "MATH" : {color="darkslategray"; break;}
@@ -88,7 +88,10 @@ function moduleColor (module) {
for(i = 0; i < cols.length; i++) {cols[i].style.backgroundColor = color;};
for (j of [1,2,3,4,5,6]) {
var hh = document.getElementsByTagName("H" + j);
-for(i = 0; i < hh.length; i++) {hh[i].style.color = color;}
+for(i = 0; i < hh.length; i++) {
+hh[i].style.color = color;
+hh[i].style.borderBottomColor = color;
+}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 27b29a5a841b6b3bf91384419ec1d75ba8ddbe54 Author: Olivier Hallot AuthorDate: Thu Jun 11 15:34:27 2020 -0300 Commit: Gerrit Code Review CommitDate: Thu Jun 11 20:34:27 2020 +0200 Update git submodules * Update helpcontent2 from branch 'master' to 7c55241a443bdbfaa46613ddd456edfeb9f5e1b3 - Fix applicaiton color and h1 underline CSS Change-Id: Ia8a18f4a8e1bd12c40a092528e68ec2f12846ac1 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/96162 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 7c39ebe635e4..7c55241a443b 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 7c39ebe635e48c0362375c731724d6f8bd15971a +Subproject commit 7c55241a443bdbfaa46613ddd456edfeb9f5e1b3 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/gtk3/gtk3gtkframe.cxx | 17 -
1 file changed, 12 insertions(+), 5 deletions(-)
New commits:
commit bed1bd821384f00ee02ec80594ee0fc4c5f15abe
Author: Caolán McNamara
AuthorDate: Thu Jun 11 15:04:31 2020 +0100
Commit: Caolán McNamara
CommitDate: Thu Jun 11 20:30:58 2020 +0200
allow tabbing between native widgets in floating windows
i.e. in the calc autofilter menu-alike popups
Change-Id: I93fc74325b8d39807e5126fc694addd3d0a50d53
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96127
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index 5f2ec2a152b2..62307f5deef0 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -3087,16 +3087,23 @@ gboolean GtkSalFrame::signalFocus( GtkWidget*,
GdkEventFocus* pEvent, gpointer f
return false;
}
+// change of focus between native widgets within the toplevel
void GtkSalFrame::signalSetFocus(GtkWindow*, GtkWidget* pWidget, gpointer
frame)
{
-// do not propagate focus get/lose if floats are open
-if (m_nFloats)
-return;
-// change of focus between native widgets within the toplevel
GtkSalFrame* pThis = static_cast(frame);
+
+GtkWidget* pGrabWidget;
+if (GTK_IS_EVENT_BOX(pThis->m_pWindow))
+pGrabWidget = GTK_WIDGET(pThis->m_pWindow);
+else
+pGrabWidget = GTK_WIDGET(pThis->m_pFixedContainer);
+
// tdf#129634 interpret losing focus as focus passing explicitly to
another widget
-bool bLoseFocus = pWidget && pWidget !=
GTK_WIDGET(pThis->m_pFixedContainer);
+bool bLoseFocus = pWidget && pWidget != pGrabWidget;
+
+// do not propagate focus get/lose if floats are open
pThis->CallCallbackExc(bLoseFocus ? SalEvent::LoseFocus :
SalEvent::GetFocus, nullptr);
+
gtk_widget_set_can_focus(GTK_WIDGET(pThis->m_pFixedContainer),
!bLoseFocus);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: android/lib configure.ac
android/lib/src/main/cpp/CMakeLists.txt.in |5 +
configure.ac | 28 +++-
2 files changed, 32 insertions(+), 1 deletion(-)
New commits:
commit 2eec63af299e2169d87f0563c6eb8637ac4154d4
Author: Henry Castro
AuthorDate: Fri Jun 5 10:32:20 2020 -0400
Commit: Henry Castro
CommitDate: Thu Jun 11 20:11:44 2020 +0200
android: add "x86_64" ABI build variant
Change-Id: I19281af5432ae5a02f26f33464ced722759a4c67
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95609
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Henry Castro
diff --git a/android/lib/src/main/cpp/CMakeLists.txt.in
b/android/lib/src/main/cpp/CMakeLists.txt.in
index 7715dbbdc..36b63132a 100644
--- a/android/lib/src/main/cpp/CMakeLists.txt.in
+++ b/android/lib/src/main/cpp/CMakeLists.txt.in
@@ -1,3 +1,4 @@
+
cmake_minimum_required(VERSION 3.4.1)
add_library(androidapp SHARED
@@ -34,6 +35,10 @@ elseif(${ANDROID_ABI} STREQUAL "arm64-v8a")
set(LOBUILDDIR_ABI @LOBUILDDIR_ARM64_V8A@)
set(POCOINCLUDE_ABI @POCOINCLUDE_ARM64_V8A@)
set(POCOLIB_ABI @POCOLIB_ARM64_V8A@)
+elseif(${ANDROID_ABI} STREQUAL "x86_64")
+set(LOBUILDDIR_ABI @LOBUILDDIR@)
+set(POCOINCLUDE_ABI @POCOINCLUDE@)
+set(POCOLIB_ABI @POCOLIB@)
else()
MESSAGE(FATAL_ERROR "Cannot build for ABI ${ANDROID_ABI}, please add
support for that.")
endif()
diff --git a/configure.ac b/configure.ac
index 3b2edb7c1..8d9cf761a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -356,7 +356,9 @@ fi
# to the Mac.
# Android: We need these to setup the CMakeLists.txt properly.
LOBUILDDIR=
-ANDROID_ABI="armeabi-v7a"
+if test -z "$ANDROID_ABI"; then
+ ANDROID_ABI="armeabi-v7a"
+fi
LOBUILDDIR_ARM64_V8A=
POCOINCLUDE=
POCOINCLUDE_ARM64_V8A=
@@ -379,6 +381,13 @@ if test \( "$enable_iosapp" = "yes" -a `uname -s` =
"Darwin" \) -o \( "$enable_a
fi
# Sanity check, just a random object file in the LibreOffice build tree
- 64bit
+ if test "$ANDROID_ABI" = "x86_64" ; then
+ if test -f
"$LOBUILDDIR/workdir/LinkTarget/StaticLibrary/liblibpng.a" ; then
+ AC_MSG_RESULT([$LOBUILDDIR])
+ else
+ AC_MSG_ERROR([This is not a LibreOffice 64bit core build
directory: $LOBUILDDIR])
+ fi
+ else
if test "$ANDROID_ABI" != "armeabi-v7a" ; then
if test -f
"$LOBUILDDIR_ARM64_V8A/workdir/LinkTarget/StaticLibrary/liblibpng.a" ; then
AC_MSG_RESULT([$LOBUILDDIR_ARM64_V8A])
@@ -386,6 +395,7 @@ if test \( "$enable_iosapp" = "yes" -a `uname -s` =
"Darwin" \) -o \( "$enable_a
AC_MSG_ERROR([This is not a LibreOffice 64bit core build
directory: $LOBUILDDIR_ARM64_V8A])
fi
fi
+ fi
fi
# Get the git hash of the core build
@@ -411,6 +421,13 @@ if test \( "$enable_iosapp" = "yes" -a `uname -s` =
"Darwin" \) -o \( "$enable_a
fi
# Sanity check - 64bit
+ if test "$ANDROID_ABI" = "x86_64" ; then
+ if test -f "$POCOINCLUDE/Poco/Poco.h"; then
+ AC_MSG_RESULT([$POCOINCLUDE])
+ else
+ AC_MSG_ERROR([This is not a Poco 64bit include directory:
$POCOINCLUDE])
+ fi
+ else
if test "$ANDROID_ABI" != "armeabi-v7a" ; then
if test -f "$POCOINCLUDE_ARM64_V8A/Poco/Poco.h"; then
AC_MSG_RESULT([$POCOINCLUDE_ARM64_V8A])
@@ -418,6 +435,7 @@ if test \( "$enable_iosapp" = "yes" -a `uname -s` =
"Darwin" \) -o \( "$enable_a
AC_MSG_ERROR([This is not a Poco 64bit include directory:
$POCOINCLUDE_ARM64_V8A])
fi
fi
+ fi
fi
# Sanity check
@@ -440,6 +458,13 @@ if test \( "$enable_iosapp" = "yes" -a `uname -s` =
"Darwin" \) -o \( "$enable_a
fi
# Sanity check - 64bit
+ if test "$ANDROID_ABI" = "x86_64" ; then
+ if test -f "$POCOLIB/libPocoFoundation.a"; then
+ AC_MSG_RESULT([$POCOLIB])
+ else
+ AC_MSG_ERROR([This is not a Poco 64bit lib directory: $POCOLIB])
+ fi
+ else
if test "$ANDROID_ABI" != "armeabi-v7a" ; then
if test -f "$POCOLIB_ARM64_V8A/libPocoFoundation.a"; then
AC_MSG_RESULT([$POCOLIB_ARM64_V8A])
@@ -447,6 +472,7 @@ if test \( "$enable_iosapp" = "yes" -a `uname -s` =
"Darwin" \) -o \( "$enable_a
AC_MSG_ERROR([This is not a Poco 64bit lib directory:
$POCOLIB_ARM64_V8A])
fi
fi
+ fi
fi
# Sanity check
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/nisz/libreoffice-6-4' - sc/source
sc/source/ui/cctrl/checklistmenu.cxx |6 --
sc/source/ui/inc/checklistmenu.hxx |2 +-
2 files changed, 5 insertions(+), 3 deletions(-)
New commits:
commit 1f2e111caa13d6f2c7595ed1c6831742450441ec
Author: Noel Grandin
AuthorDate: Fri May 29 15:10:08 2020 +0200
Commit: Gabor Kelemen
CommitDate: Thu Jun 11 20:08:41 2020 +0200
fix tree disabled in autofilter pulldown, tdf#76481 related
regression from
commit f71557e958a8a626dfc1eef646b84b3c8b72569a
Date: Thu May 21 15:05:08 2020 +0200
tdf#76481 speed up searching in autofilter pulldown
Change-Id: Iac7fba87e12ae68a040706694ef94655113a6491
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95142
Tested-by: Jenkins
Reviewed-by: Noel Grandin
(cherry picked from commit b81432a23c900329ece07854fd06a35a97c1)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96173
Tested-by: Gabor Kelemen
Reviewed-by: Gabor Kelemen
diff --git a/sc/source/ui/cctrl/checklistmenu.cxx
b/sc/source/ui/cctrl/checklistmenu.cxx
index 664b63444748..0ddd31748958 100644
--- a/sc/source/ui/cctrl/checklistmenu.cxx
+++ b/sc/source/ui/cctrl/checklistmenu.cxx
@@ -1230,7 +1230,7 @@ IMPL_LINK_NOARG(ScCheckListMenuWindow, EdModifyHdl,
Edit&, void)
{
// when there are a lot of rows, it is cheaper to simply clear the
tree and re-initialise
maChecks->Clear();
-initMembers();
+nSelCount = initMembers();
}
else
{
@@ -1888,11 +1888,12 @@ void ScCheckListMenuWindow::setHasDates(bool bHasDates)
maChecks->SetStyle(WB_HASBUTTONS);
}
-void ScCheckListMenuWindow::initMembers()
+size_t ScCheckListMenuWindow::initMembers()
{
size_t n = maMembers.size();
size_t nVisMemCount = 0;
+
maChecks->SetUpdateMode(false);
maChecks->GetModel()->EnableInvalidate(false);
@@ -1944,6 +1945,7 @@ void ScCheckListMenuWindow::initMembers()
maChecks->GetModel()->EnableInvalidate(true);
maChecks->SetUpdateMode(true);
+return nVisMemCount;
}
void ScCheckListMenuWindow::setConfig(const Config& rConfig)
diff --git a/sc/source/ui/inc/checklistmenu.hxx
b/sc/source/ui/inc/checklistmenu.hxx
index 2ff574a15252..f9affb88f096 100644
--- a/sc/source/ui/inc/checklistmenu.hxx
+++ b/sc/source/ui/inc/checklistmenu.hxx
@@ -348,7 +348,7 @@ public:
void setHasDates(bool bHasDates);
void addDateMember(const OUString& rName, double nVal, bool bVisible);
void addMember(const OUString& rName, bool bVisible);
-void initMembers();
+size_t initMembers();
void setConfig(const Config& rConfig);
bool isAllSelected() const;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/nisz/libreoffice-6-4' - sc/source
sc/source/ui/cctrl/checklistmenu.cxx | 60 ---
1 file changed, 29 insertions(+), 31 deletions(-)
New commits:
commit 32fbbe2a4d75d88e0185908bddc9ac039048afc3
Author: Noel Grandin
AuthorDate: Thu May 21 15:05:08 2020 +0200
Commit: Gabor Kelemen
CommitDate: Thu Jun 11 19:56:14 2020 +0200
tdf#76481 speed up searching in autofilter pulldown
turning setUpdateMode on/off fixes the common case, but we need to
special case the "return to show all items" situation
On my machine this takes the searching time from "more than 30s" to
"just under 1s"
Change-Id: I02d11c428e82dba1e840e981507337a1012dd09f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94633
Tested-by: Jenkins
Reviewed-by: Noel Grandin
(cherry picked from commit f71557e958a8a626dfc1eef646b84b3c8b72569a)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96172
Tested-by: Gabor Kelemen
Reviewed-by: Gabor Kelemen
diff --git a/sc/source/ui/cctrl/checklistmenu.cxx
b/sc/source/ui/cctrl/checklistmenu.cxx
index b9b5acca11c8..664b63444748 100644
--- a/sc/source/ui/cctrl/checklistmenu.cxx
+++ b/sc/source/ui/cctrl/checklistmenu.cxx
@@ -1222,20 +1222,27 @@ IMPL_LINK_NOARG(ScCheckListMenuWindow, EdModifyHdl,
Edit&, void)
bool bSearchTextEmpty = aSearchText.isEmpty();
size_t n = maMembers.size();
size_t nSelCount = 0;
-OUString aLabelDisp;
bool bSomeDateDeletes = false;
-for (size_t i = 0; i < n; ++i)
+maChecks->SetUpdateMode(false);
+
+if (bSearchTextEmpty)
+{
+// when there are a lot of rows, it is cheaper to simply clear the
tree and re-initialise
+maChecks->Clear();
+initMembers();
+}
+else
{
-bool bIsDate = maMembers[i].mbDate;
-bool bPartialMatch = false;
+for (size_t i = 0; i < n; ++i)
+{
+bool bIsDate = maMembers[i].mbDate;
+bool bPartialMatch = false;
-aLabelDisp = maMembers[i].maName;
-if ( aLabelDisp.isEmpty() )
-aLabelDisp = ScResId( STR_EMPTYDATA );
+OUString aLabelDisp = maMembers[i].maName;
+if ( aLabelDisp.isEmpty() )
+aLabelDisp = ScResId( STR_EMPTYDATA );
-if ( !bSearchTextEmpty )
-{
if ( !bIsDate )
bPartialMatch = ( ScGlobal::pCharClass->lowercase( aLabelDisp
).indexOf( aSearchText ) != -1 );
else if ( maMembers[i].meDatePartType == ScCheckListMember::DAY )
// Match with both numerical and text version of month
@@ -1243,30 +1250,19 @@ IMPL_LINK_NOARG(ScCheckListMenuWindow, EdModifyHdl,
Edit&, void)
maMembers[i].maRealName +
maMembers[i].maDateParts[1] )).indexOf( aSearchText ) != -1);
else
continue;
-}
-else if ( bIsDate && maMembers[i].meDatePartType !=
ScCheckListMember::DAY )
-continue;
-if ( bSearchTextEmpty )
-{
-SvTreeListEntry* pLeaf = maChecks->ShowCheckEntry( aLabelDisp,
maMembers[i], true, maMembers[i].mbVisible );
-updateMemberParents( pLeaf, i );
-if ( maMembers[i].mbVisible )
+if ( bPartialMatch )
+{
+SvTreeListEntry* pLeaf = maChecks->ShowCheckEntry( aLabelDisp,
maMembers[i] );
+updateMemberParents( pLeaf, i );
++nSelCount;
-continue;
-}
-
-if ( bPartialMatch )
-{
-SvTreeListEntry* pLeaf = maChecks->ShowCheckEntry( aLabelDisp,
maMembers[i] );
-updateMemberParents( pLeaf, i );
-++nSelCount;
-}
-else
-{
-maChecks->ShowCheckEntry( aLabelDisp, maMembers[i], false, false );
-if( bIsDate )
-bSomeDateDeletes = true;
+}
+else
+{
+maChecks->ShowCheckEntry( aLabelDisp, maMembers[i], false,
false );
+if( bIsDate )
+bSomeDateDeletes = true;
+}
}
}
@@ -1280,6 +1276,8 @@ IMPL_LINK_NOARG(ScCheckListMenuWindow, EdModifyHdl,
Edit&, void)
}
}
+maChecks->SetUpdateMode(true);
+
if ( nSelCount == n )
maChkToggleAll->SetState( TRISTATE_TRUE );
else if ( nSelCount == 0 )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/nisz/libreoffice-6-4' - sw/qa sw/source
sw/qa/extras/tiledrendering/data/tdf117448.fodt | 29 +
sw/qa/extras/tiledrendering/tiledrendering.cxx | 32
sw/source/core/text/itrpaint.cxx|8 +-
sw/source/core/text/txtpaint.cxx| 11 +++-
sw/source/core/text/txtpaint.hxx| 11 ++--
5 files changed, 86 insertions(+), 5 deletions(-)
New commits:
commit fad1d1f57cd8f6ea8a7e20e9834fb82fd39e7240
Author: László Németh
AuthorDate: Fri Mar 20 15:12:06 2020 +0100
Commit: Gabor Kelemen
CommitDate: Thu Jun 11 19:47:15 2020 +0200
tdf#117448 Writer table: don't clip text on margins
Use area of paragraph margins to show top and bottom
of the clipped text at small fixed line height, like
MSO does. This results noticeable difference in tables,
where small fixed line height is a method to set narrow
table rows, but LibreOffice hid top and bottom of the
characters according to the line height which is smaller,
than the character height.
Note: PDF export has already showed top and bottom of the
characters in this case, and not in tables. But according
to the editing glitches (missing update of the clipped
area during typing), we don't want to extend this behaviour
for not table content, yet.
Change-Id: I7aff5405314948f301bfb71bf35cc1911e194f8b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90798
Tested-by: Jenkins
Reviewed-by: László Németh
(cherry picked from commit b6ef43f678c55330d7d8174201fadc55d5381f42)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96170
Tested-by: Gabor Kelemen
Reviewed-by: Gabor Kelemen
diff --git a/sw/qa/extras/tiledrendering/data/tdf117448.fodt
b/sw/qa/extras/tiledrendering/data/tdf117448.fodt
new file mode 100644
index ..eccadee25974
--- /dev/null
+++ b/sw/qa/extras/tiledrendering/data/tdf117448.fodt
@@ -0,0 +1,29 @@
+
+http://openoffice.org/2009/office";
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
office:version="1.2" office:mimetype="application/vnd.oasis.opendocument.text">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Text without clipping.
+
+
+
+
+
+
diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx
b/sw/qa/extras/tiledrendering/tiledrendering.cxx
index e6b624a5cb1e..6b612cd0ac09 100644
--- a/sw/qa/extras/tiledrendering/tiledrendering.cxx
+++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx
@@ -119,6 +119,7 @@ public:
void testVisCursorInvalidation();
void testDeselectCustomShape();
void testSemiTransparent();
+void testClipText();
void testAnchorTypes();
void testLanguageStatus();
@@ -180,6 +181,7 @@ public:
CPPUNIT_TEST(testVisCursorInvalidation);
CPPUNIT_TEST(testDeselectCustomShape);
CPPUNIT_TEST(testSemiTransparent);
+CPPUNIT_TEST(testClipText);
CPPUNIT_TEST(testAnchorTypes);
CPPUNIT_TEST(testLanguageStatus);
CPPUNIT_TEST_SUITE_END();
@@ -2421,6 +2423,36 @@ void SwTiledRenderingTest::testSemiTransparent()
CPPUNIT_ASSERT_GREATEREQUAL(190, static_cast(aColor.B));
}
+void SwTiledRenderingTest::testClipText()
+{
+// Load a document where the top left tile contains table text with
+// too small line height, but with top and bottom paragraph margins,
+// avoiding of clipping top and bottom parts of the characters.
+SwXTextDocument* pXTextDocument = createDoc("tdf117448.fodt");
+
+// Render a larger area, and then get the top and bottom of the text in
that tile
+size_t nCanvasWidth = 1024;
+size_t nCanvasHeight = 512;
+size_t nTileSize = 256;
+std::vector aPixmap(nCanvasWidth * nCanvasHeight * 4, 0);
+ScopedVclPtrInstance pDevice(DeviceFormat::DEFAULT);
+pDevice->SetBackground(Wallpaper(COL_TRANSPARENT));
+pDevice->SetOutputSizePixelScaleOffsetAndBuffer(Size(nCanvasWidth,
nCanvasHeight),
+Fraction(1.0), Point(),
aPixmap.data());
+pXTextDocument->paintTile(*pDevice, nCanvasWidth, nCanvasHeight,
/*nTilePosX=*/0,
+ /*nTilePosY=*/0, /*nTileWidth=*/15360,
/*nTileHeight=*/7680);
+pDevice->EnableMapMode(false);
+Bitmap aBitmap = pDevice->GetBitmap(Point(0, 0), Size(nTileSize,
nTileSize));
+Bitmap::ScopedReadAccess pAccess(aBitmap);
+
+// check top of the letter "T", it's not a white pixel
+Color aTopTextColor(pAccess->GetPixel(98, 100));
+CPPUNIT_ASSERT_LESS(255, static_cast(aTopTextColor.R));
+// check bottom of the letter "g", it's not a white pixel
+Color aBottomTextColor(pAccess->GetPixel(112, 228));
+CPPUNIT_ASSERT_LESS(255, static_cast(aBottomTextColor.R));
+}
+
void SwTiledRenderingTest::testAnchorTypes()
{
comphelper::LibreOfficeKit::setActive();
diff --git a/sw/source/core/text/itrpaint.cxx b/sw/source/core/text/itrpaint.cxx
i
[Libreoffice-commits] online.git: loleaflet/src wsd/DocumentBroker.cpp wsd/Storage.cpp wsd/Storage.hpp
loleaflet/src/control/Control.DocumentNameInput.js |7 +++
loleaflet/src/map/handler/Map.WOPI.js |4
wsd/DocumentBroker.cpp |2 ++
wsd/Storage.cpp|1 +
wsd/Storage.hpp|4
5 files changed, 14 insertions(+), 4 deletions(-)
New commits:
commit d34854f6884940b683d4cff4b8a7496de63cae35
Author: Michael Meeks
AuthorDate: Tue Jun 9 17:43:58 2020 +0100
Commit: Michael Meeks
CommitDate: Thu Jun 11 19:44:01 2020 +0200
Add support for BreadcrumbDocName.
Change-Id: I06c56e92dd3acf9269140ecefb0c8bc731191260
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95960
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Michael Meeks
diff --git a/loleaflet/src/control/Control.DocumentNameInput.js
b/loleaflet/src/control/Control.DocumentNameInput.js
index 28db57f41..cfc4e5998 100644
--- a/loleaflet/src/control/Control.DocumentNameInput.js
+++ b/loleaflet/src/control/Control.DocumentNameInput.js
@@ -40,7 +40,7 @@ L.Control.DocumentNameInput = L.Control.extend({
},
documentNameCancel: function() {
- $('#document-name-input').val(this.map['wopi'].BaseFileName);
+
$('#document-name-input').val(this.map['wopi'].BreadcrumbDocName);
this.map._onGotFocus();
},
@@ -97,10 +97,9 @@ L.Control.DocumentNameInput = L.Control.extend({
},
onWopiProps: function(e) {
- if (e.BaseFileName !== null) {
+ if (e.BaseFileName !== null)
// set the document name into the name field
- $('#document-name-input').val(e.BaseFileName);
- }
+ $('#document-name-input').val(e.BreadcrumbDocName !==
undefined ? e.BreadcrumbDocName : e.BaseFileName);
if (e.UserCanNotWriteRelative === false) {
// Save As allowed
diff --git a/loleaflet/src/map/handler/Map.WOPI.js
b/loleaflet/src/map/handler/Map.WOPI.js
index da79219e8..3e41b7fae 100644
--- a/loleaflet/src/map/handler/Map.WOPI.js
+++ b/loleaflet/src/map/handler/Map.WOPI.js
@@ -10,6 +10,7 @@ L.Map.WOPI = L.Handler.extend({
// wouldn't be possible otherwise.
PostMessageOrigin: '*',
BaseFileName: '',
+ BreadcrumbDocName: '',
DocumentLoadedTime: false,
HidePrintOption: false,
HideSaveOption: false,
@@ -76,6 +77,9 @@ L.Map.WOPI = L.Handler.extend({
}
this.BaseFileName = wopiInfo['BaseFileName'];
+ this.BreadcrumbDocName = wopiInfo['BreadcrumbDocName'];
+ if (this.BreadcrumbDocName === undefined)
+ this.BreadcrumbDocName = this.BaseFileName;
this.HidePrintOption = !!wopiInfo['HidePrintOption'];
this.HideSaveOption = !!wopiInfo['HideSaveOption'];
this.HideExportOption = !!wopiInfo['HideExportOption'];
diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
index 55e921295..f62241808 100644
--- a/wsd/DocumentBroker.cpp
+++ b/wsd/DocumentBroker.cpp
@@ -659,6 +659,8 @@ bool DocumentBroker::load(const
std::shared_ptr& session, const s
wopifileinfo->setHideExportOption(true);
wopiInfo->set("BaseFileName",
wopiStorage->getFileInfo().getFilename());
+if (wopifileinfo->getBreadcrumbDocName().size())
+wopiInfo->set("BreadcrumbDocName",
wopifileinfo->getBreadcrumbDocName());
if (!wopifileinfo->getTemplateSaveAs().empty())
wopiInfo->set("TemplateSaveAs", wopifileinfo->getTemplateSaveAs());
diff --git a/wsd/Storage.cpp b/wsd/Storage.cpp
index 3960544c2..1da4eaf74 100644
--- a/wsd/Storage.cpp
+++ b/wsd/Storage.cpp
@@ -737,6 +737,7 @@ WopiStorage::WOPIFileInfo::WOPIFileInfo(const FileInfo
&fileInfo,
JsonUtil::findJSONValue(object, "SupportsLocks", _supportsLocks);
JsonUtil::findJSONValue(object, "SupportsRename", _supportsRename);
JsonUtil::findJSONValue(object, "UserCanRename", _userCanRename);
+JsonUtil::findJSONValue(object, "BreadcrumbDocName", _breadcrumbDocName);
bool booleanFlag = false;
if (JsonUtil::findJSONValue(object, "DisableChangeTrackingRecord",
booleanFlag))
_disableChangeTrackingRecord = (booleanFlag ?
WOPIFileInfo::TriState::True : WOPIFileInfo::TriState::False);
diff --git a/wsd/Storage.hpp b/wsd/Storage.hpp
index 5adb2da0c..b426d44bd 100644
--- a/wsd/Storage.hpp
+++ b/wsd/Storage.hpp
@@ -386,6 +386,8 @@ public:
const std::string& getWatermarkText() const { return _watermarkText; }
const std::string& getTemplateSaveAs() const { return _templateSaveAs;
}
const std::string& getTemplateSource() const { return _templateSource;
}
+const std::string& getBreadcrumbDocName() const { return
_breadcrumbDocName; }
+
bool getUserCanWrite()
[Libreoffice-commits] core.git: Branch 'distro/nisz/libreoffice-6-4' - sw/qa writerfilter/source
sw/qa/extras/ooxmlexport/data/tdf59274.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport10.cxx | 14 +
writerfilter/source/dmapper/DomainMapperTableManager.cxx | 37 ++-
3 files changed, 50 insertions(+), 1 deletion(-)
New commits:
commit 08a33f29f26ca21668e67f46e40ec3264d743d9c
Author: László Németh
AuthorDate: Tue Mar 10 15:44:59 2020 +0100
Commit: Gabor Kelemen
CommitDate: Thu Jun 11 19:19:37 2020 +0200
tdf#59274 DOCX import: fix tables with incomplete grid
Fix layout of "auto" width tables with incomplete grids,
where table width is defined by cells of an arbitrary
table row, not necessarily the first row, and last cells
of the rows can be wider, than their saved values.
Change-Id: I68bc8f1a4f57f3c64d0e83c585f2be129d9b5a84
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90261
Tested-by: László Németh
Reviewed-by: László Németh
(cherry picked from commit 116cadb5d2582532c69677a2f8499e8e9b7b9b80)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96145
Tested-by: Gabor Kelemen
Reviewed-by: Gabor Kelemen
diff --git a/sw/qa/extras/ooxmlexport/data/tdf59274.docx
b/sw/qa/extras/ooxmlexport/data/tdf59274.docx
new file mode 100644
index ..38aad9ae9137
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf59274.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx
index 835947da9dfb..86b5ce6e4c28 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx
@@ -383,6 +383,20 @@ DECLARE_OOXMLEXPORT_TEST(testFdo73389,"fdo73389.docx")
assertXPath(pXmlDoc,
"/w:document/w:body/w:tbl/w:tr/w:tc/w:tbl/w:tblPr/w:tblW","w","5000");
}
+DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf59274, "tdf59274.docx")
+{
+// Table with "auto" table width and incomplete grid: 11 columns, but only
4 gridCol elements.
+xmlDocPtr pXmlDoc = parseExport();
+
+assertXPath(pXmlDoc, "/w:document/w:body/w:tbl/w:tblPr/w:tblW", "type",
"dxa");
+// This was 7349: sum of the cell widths in first row, but the table width
is determined by a longer row later.
+assertXPath(pXmlDoc, "/w:document/w:body/w:tbl/w:tblPr/w:tblW", "w",
"9048");
+// This was 1224: too narrow first cell in first row
+assertXPath(pXmlDoc,
"/w:document/w:body/w:tbl/w:tr[1]/w:tc[1]/w:tcPr/w:tcW", "w", "4291");
+// This was 3674: too wide last cell in first row
+assertXPath(pXmlDoc,
"/w:document/w:body/w:tbl/w:tr[1]/w:tc[4]/w:tcPr/w:tcW", "w", "1695");
+}
+
DECLARE_OOXMLEXPORT_TEST(testDMLGroupshapeSdt, "dml-groupshape-sdt.docx")
{
uno::Reference xGroupShape(getShape(1), uno::UNO_QUERY);
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
index d422cfa98c13..c16485d48771 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
@@ -646,6 +646,7 @@ void DomainMapperTableManager::endOfRowAction()
for (int i : (*pTableGrid))
nFullWidthRelative = o3tl::saturating_add(nFullWidthRelative, i);
+bool bIsIncompleteGrid = false;
if( pTableGrid->size() == ( nGrids + m_nGridAfter ) && m_nCell.back( ) > 0
)
{
/*
@@ -714,7 +715,8 @@ void DomainMapperTableManager::endOfRowAction()
}
else if ( !pCellWidths->empty() &&
( m_nLayoutType == NS_ooxml::LN_Value_doc_ST_TblLayout_fixed
- || pCellWidths->size() == ( nGrids + m_nGridAfter ) )
+ || pCellWidths->size() == ( nGrids + m_nGridAfter )
+ || ((bIsIncompleteGrid = true) && nGrids + m_nGridAfter >
pTableGrid->size() && pCellWidths->size() > 0) )
)
{
// If we're here, then the number of cells does not equal to the amount
@@ -725,21 +727,54 @@ void DomainMapperTableManager::endOfRowAction()
// On the other hand even if the layout is not fixed, but the cell
widths
// provided equal the total number of cells, and there are no
after/before cells
// then use the cell widths to calculate the column separators.
+// Also handle autofit tables with incomplete grids, when rows can have
+// different widths and last cells can be wider, than their values.
uno::Sequence< text::TableColumnSeparator >
aSeparators(pCellWidths->size() - 1);
text::TableColumnSeparator* pSeparators = aSeparators.getArray();
sal_Int16 nSum = 0;
sal_uInt32 nPos = 0;
+
+if (bIsIncompleteGrid)
+nFullWidthRelative = 0;
+
// Avoid divide by zero (if there's no grid, position using cell
widths).
if( nFullWidthRelative == 0 )
for (size_t i = 0; i < pCellWidths->size(); ++i)
nFullWidthRelative += (*pCellWidths)[i];
+if (bIsIncompleteGrid)
+
[Libreoffice-commits] core.git: sw/source
sw/source/core/undo/undobj.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit be2f539012d818eaa2d40a9cf199b53d32e1dee4 Author: Michael Stahl AuthorDate: Thu Jun 11 14:12:28 2020 +0200 Commit: Michael Stahl CommitDate: Thu Jun 11 19:10:03 2020 +0200 tdf#132321 sw: adapt fly at-para deletion to at-char wrt. sections 971205dc2110c1c23ff1db1fc4041e2babf6fa9f changed at-char selection to check that not only the start is at the start of the section or the end is at the end of the section, but that both are true. Let's do this for at-para flys too for consistency, changing what was introduced with 91b2325808a75174f284c48c8b8afc118fad74e4. Change-Id: I1ec93b076d729288ce0809d1cfc24379aa9591ab Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96125 Tested-by: Jenkins Reviewed-by: Michael Stahl diff --git a/sw/source/core/undo/undobj.cxx b/sw/source/core/undo/undobj.cxx index 2fb9a44da30b..0de5562c3c46 100644 --- a/sw/source/core/undo/undobj.cxx +++ b/sw/source/core/undo/undobj.cxx @@ -1631,14 +1631,14 @@ bool IsSelectFrameAnchoredAtPara(SwPosition const & rAnchorPos, && ((rStart.nNode != rEnd.nNode && rStart.nContent == 0 // but not if the selection is backspace/delete! && IsNotBackspaceHeuristic(rStart, rEnd)) -|| IsAtStartOfSection(rStart +|| (IsAtStartOfSection(rAnchorPos) && IsAtEndOfSection2(rEnd) && ((rAnchorPos.nNode < rEnd.nNode) || (rAnchorPos.nNode == rEnd.nNode && !(nDelContentType & DelContentType::ExcludeFlyAtStartEnd) // special case: fully deleted node && ((rEnd.nNode != rStart.nNode && rEnd.nContent == rEnd.nNode.GetNode().GetTextNode()->Len() && IsNotBackspaceHeuristic(rStart, rEnd)) -|| IsAtEndOfSection(rEnd; +|| (IsAtEndOfSection(rAnchorPos) && IsAtStartOfSection2(rStart); } /* 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: sw/source
sw/source/core/undo/undobj.cxx | 17 +++--
1 file changed, 15 insertions(+), 2 deletions(-)
New commits:
commit cc4b5091e739116a7ec83513fa1cd856f0130330
Author: Michael Stahl
AuthorDate: Thu Jun 11 15:26:27 2020 +0200
Commit: Michael Stahl
CommitDate: Thu Jun 11 19:09:41 2020 +0200
tdf#132744 sw: fix subtle difference when checking end of section
In a few places, such as CopyFlyInFlyImpl() and DelFlyInRange(),
the passed start/end positions aren't necessarily from a cursor but can
be section start/end nodes instead.
(regression from 971205dc2110c1c23ff1db1fc4041e2babf6fa9f)
Change-Id: I1fb24f1f9d027aa3685ac5a7459891cb8c2b9a41
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96124
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/sw/source/core/undo/undobj.cxx b/sw/source/core/undo/undobj.cxx
index 54c5181b43f4..2fb9a44da30b 100644
--- a/sw/source/core/undo/undobj.cxx
+++ b/sw/source/core/undo/undobj.cxx
@@ -1536,6 +1536,19 @@ static bool IsAtStartOfSection(SwPosition const&
rAnchorPos)
return node == rAnchorPos.nNode && rAnchorPos.nContent == 0;
}
+/// passed start / end position could be on section start / end node
+static bool IsAtEndOfSection2(SwPosition const& rPos)
+{
+return rPos.nNode.GetNode().IsEndNode()
+|| IsAtEndOfSection(rPos);
+}
+
+static bool IsAtStartOfSection2(SwPosition const& rPos)
+{
+return rPos.nNode.GetNode().IsStartNode()
+|| IsAtStartOfSection(rPos);
+}
+
static bool IsNotBackspaceHeuristic(
SwPosition const& rStart, SwPosition const& rEnd)
{
@@ -1577,13 +1590,13 @@ bool IsDestroyFrameAnchoredAtChar(SwPosition const &
rAnchorPos,
&& ((rStart.nNode != rEnd.nNode && rStart.nContent == 0
// but not if the selection is backspace/delete!
&& IsNotBackspaceHeuristic(rStart, rEnd))
-|| (IsAtStartOfSection(rAnchorPos) &&
IsAtEndOfSection(rEnd)
+|| (IsAtStartOfSection(rAnchorPos) &&
IsAtEndOfSection2(rEnd)
&& ((rAnchorPos < rEnd)
|| (rAnchorPos == rEnd
// special case: fully deleted node
&& ((rEnd.nNode != rStart.nNode && rEnd.nContent ==
rEnd.nNode.GetNode().GetTextNode()->Len()
&& IsNotBackspaceHeuristic(rStart, rEnd))
-|| (IsAtEndOfSection(rAnchorPos) &&
IsAtStartOfSection(rStart);
+|| (IsAtEndOfSection(rAnchorPos) &&
IsAtStartOfSection2(rStart);
}
bool IsSelectFrameAnchoredAtPara(SwPosition const & rAnchorPos,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/nisz/libreoffice-6-4' - sw/qa sw/source
sw/qa/extras/ooxmlexport/data/tdf107626.odt |binary
sw/qa/extras/ooxmlexport/ooxmlexport9.cxx|7 +++
sw/source/filter/ww8/docxattributeoutput.cxx | 17 -
3 files changed, 23 insertions(+), 1 deletion(-)
New commits:
commit c5b8bbfeeb7420b86df131c618469a840db7281c
Author: László Németh
AuthorDate: Fri Mar 6 22:26:17 2020 +0100
Commit: Gabor Kelemen
CommitDate: Thu Jun 11 19:06:48 2020 +0200
tdf#107626 DOCX table export: fix missing trailing cells
resulting broken table layout with incomplete cell merging,
for example, content in extra table rows and in columns
of different lengths.
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90136
Tested-by: László Németh
Reviewed-by: László Németh
(cherry picked from commit 6db846c3c0bc1c44da1f3c7a8dea385930acc3b1)
Change-Id: Ic5057e43d4c66e34ffc1373030be66815ff52563
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96143
Tested-by: Gabor Kelemen
Reviewed-by: Gabor Kelemen
diff --git a/sw/qa/extras/ooxmlexport/data/tdf107626.odt
b/sw/qa/extras/ooxmlexport/data/tdf107626.odt
new file mode 100644
index ..b7c8489cd341
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf107626.odt differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
index ece282f437aa..6e9d628763b1 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
@@ -184,6 +184,13 @@ DECLARE_OOXMLEXPORT_TEST(testTdf106690Cell,
"tdf106690-cell.docx")
CPPUNIT_ASSERT_EQUAL(static_cast(494),
getProperty(getParagraphOfText(2, xCell->getText()),
"ParaBottomMargin"));
}
+DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf107626, "tdf107626.odt")
+{
+xmlDocPtr pXmlDoc = parseExport("word/document.xml");
+// This was 2 (missing trailing cell in merged cell range)
+assertXPath(pXmlDoc, "/w:document/w:body/w:tbl/w:tr[3]/w:tc", 3);
+}
+
DECLARE_OOXMLEXPORT_TEST(testTdf106970, "tdf106970.docx")
{
// The second paragraph (first numbered one) had 0 bottom margin:
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index ec37717bc7bc..ec73daf45c6d 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -949,9 +949,24 @@ void DocxAttributeOutput::FinishTableRowCell(
ww8::WW8TableNodeInfoInner::Pointe
sal_Int32 nClosedCell = lastClosedCell.back();
if (nCell == nClosedCell)
{
-//Start missing trailing cell
+//Start missing trailing cell(s)
++nCell;
StartTableCell(pInner, nCell, nRow);
+
+//Continue on missing next trailing cell(s)
+ww8::RowSpansPtr xRowSpans = pInner->getRowSpansOfRow();
+sal_Int32 nRemainingCells = xRowSpans->size() - nCell;
+for (sal_Int32 i = 1; i < nRemainingCells; ++i)
+{
+if (bForceEmptyParagraph)
+{
+m_pSerializer->singleElementNS(XML_w, XML_p);
+}
+
+EndTableCell(nCell);
+
+StartTableCell(pInner, nCell, nRow);
+}
}
if (bForceEmptyParagraph)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/nisz/libreoffice-6-4' - chart2/source sw/qa
chart2/source/tools/NumberFormatterWrapper.cxx |3 +++
sw/qa/extras/layout/data/tdf130969.docx|binary
sw/qa/extras/layout/layout.cxx | 16
3 files changed, 19 insertions(+)
New commits:
commit cd9e04eebf4a3a8f2c34061f8d8c7b67c7b1de51
Author: Balazs Varga
AuthorDate: Tue Mar 24 14:13:48 2020 +0100
Commit: Gabor Kelemen
CommitDate: Thu Jun 11 18:51:36 2020 +0200
tdf#130969 Chart view: fix incorrect precision of axis labels
Use UNLIMITED_PRECISION in case of GENERAL number format of labels
in embedded charts, just like we do in Calc.
Regression from commit: 7f373a4c88961348f35e4f990182628488878efe
(tdf#48041 Chart: do not duplicate major value)
Change-Id: I298353d748f34e23bc642b3b0c365df6e73c23aa
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90984
Tested-by: Jenkins
Reviewed-by: László Németh
(cherry picked from commit 61aa663d9b1d75d1bb0cfc7c4c9e4cb17d8dd00a)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96139
Tested-by: Gabor Kelemen
Reviewed-by: Gabor Kelemen
diff --git a/chart2/source/tools/NumberFormatterWrapper.cxx
b/chart2/source/tools/NumberFormatterWrapper.cxx
index a585c04b7dc3..50f6dc7fb132 100644
--- a/chart2/source/tools/NumberFormatterWrapper.cxx
+++ b/chart2/source/tools/NumberFormatterWrapper.cxx
@@ -105,6 +105,9 @@ OUString NumberFormatterWrapper::getFormattedString(
sal_Int32 nNumberFormatKey,
m_aNullDate >>= aNewNullDate;
m_pNumberFormatter->ChangeNullDate(aNewNullDate.Day,aNewNullDate.Month,aNewNullDate.Year);
}
+// tdf#130969: use UNLIMITED_PRECISION in case of GENERAL Number Format
+if( m_pNumberFormatter->GetStandardPrec() !=
SvNumberFormatter::UNLIMITED_PRECISION )
+
m_pNumberFormatter->ChangeStandardPrec(SvNumberFormatter::UNLIMITED_PRECISION);
m_pNumberFormatter->GetOutputString(fValue, nNumberFormatKey, aText,
&pTextColor);
if ( m_aNullDate.hasValue() )
{
diff --git a/sw/qa/extras/layout/data/tdf130969.docx
b/sw/qa/extras/layout/data/tdf130969.docx
new file mode 100644
index ..446dc16e7dd8
Binary files /dev/null and b/sw/qa/extras/layout/data/tdf130969.docx differ
diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx
index 790d3485a337..d90cc3c4521c 100644
--- a/sw/qa/extras/layout/layout.cxx
+++ b/sw/qa/extras/layout/layout.cxx
@@ -2551,6 +2551,22 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf124796)
"15");
}
+CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf130969)
+{
+SwDoc* pDoc = createDoc("tdf130969.docx");
+SwDocShell* pShell = pDoc->GetDocShell();
+
+// Dump the rendering of the first page as an XML file.
+std::shared_ptr xMetaFile = pShell->GetPreviewMetaFile();
+MetafileXmlDump dumper;
+xmlDocPtr pXmlDoc = dumpAndParse(dumper, *xMetaFile);
+CPPUNIT_ASSERT(pXmlDoc);
+
+// This failed, if the minimum value of Y axis is not 0.35781
+assertXPathContent(
+pXmlDoc,
"/metafile/push[1]/push[1]/push[1]/push[4]/push[1]/textarray[5]/text",
"0.35781");
+}
+
CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf129054)
{
SwDoc* pDoc = createDoc("tdf129054.docx");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/source include/vcl
cui/source/inc/newtabledlg.hxx |4 ++-- include/vcl/lstbox.hxx |2 +- 2 files changed, 3 insertions(+), 3 deletions(-) New commits: commit 708260185151d7e71e7bf5d298eba0e638fd2a1b Author: Noel Grandin AuthorDate: Thu Jun 11 13:00:25 2020 +0200 Commit: Noel Grandin CommitDate: Thu Jun 11 18:30:08 2020 +0200 loplugin:unnecessaryvirtual Change-Id: I40c03b338e00d8a62b8b243d8467b43342c4b093 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96115 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/cui/source/inc/newtabledlg.hxx b/cui/source/inc/newtabledlg.hxx index 9ec717c70ab1..d0e21293ca52 100644 --- a/cui/source/inc/newtabledlg.hxx +++ b/cui/source/inc/newtabledlg.hxx @@ -31,8 +31,8 @@ private: public: SvxNewTableDialog(weld::Window* pParent); -virtual sal_Int32 getRows() const; -virtual sal_Int32 getColumns() const; +sal_Int32 getRows() const; +sal_Int32 getColumns() const; }; class SvxNewTableDialogWrapper : public SvxAbstractNewTableDialog diff --git a/include/vcl/lstbox.hxx b/include/vcl/lstbox.hxx index ff44aa59af14..403d429f2605 100644 --- a/include/vcl/lstbox.hxx +++ b/include/vcl/lstbox.hxx @@ -128,7 +128,7 @@ public: virtual voidStateChanged( StateChangedType nType ) override; virtual voidDataChanged( const DataChangedEvent& rDCEvt ) override; -virtual voidSelect(); +voidSelect(); voidDoubleClick(); virtual voidGetFocus() override; virtual voidLoseFocus() override; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: android/lib
android/lib/src/main/cpp/CMakeLists.txt.in | 10 --
1 file changed, 8 insertions(+), 2 deletions(-)
New commits:
commit 56fb5793320254e8d46618be789e143e014fb83c
Author: Henry Castro
AuthorDate: Fri Jun 5 10:26:48 2020 -0400
Commit: Henry Castro
CommitDate: Thu Jun 11 18:27:58 2020 +0200
android: fix build when builddir != srcdir
Unfortunately the "liblo-native-code.so" file is located
in the LO source directory
Change-Id: I43ad3313ad2dba62d987cbdbaed5de490c52b9cc
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95608
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Henry Castro
diff --git a/android/lib/src/main/cpp/CMakeLists.txt.in
b/android/lib/src/main/cpp/CMakeLists.txt.in
index ad43e806c..7715dbbdc 100644
--- a/android/lib/src/main/cpp/CMakeLists.txt.in
+++ b/android/lib/src/main/cpp/CMakeLists.txt.in
@@ -38,6 +38,12 @@ else()
MESSAGE(FATAL_ERROR "Cannot build for ABI ${ANDROID_ABI}, please add
support for that.")
endif()
+if(EXISTS
${LOBUILDDIR_ABI}/android/jniLibs/${ANDROID_ABI}/liblo-native-code.so)
+set(LIBLO_NATIVE_CODE
${LOBUILDDIR_ABI}/android/jniLibs/${ANDROID_ABI}/liblo-native-code.so)
+else()
+set(LIBLO_NATIVE_CODE
${LOBUILDDIR_ABI}/android/source/jniLibs/${ANDROID_ABI}/liblo-native-code.so)
+endif()
+
target_include_directories(androidapp PRIVATE
. # path to androidapp.h
../../../../..# path to config.h
@@ -88,8 +94,8 @@ add_custom_command(OUTPUT
"${CMAKE_CURRENT_SOURCE_DIR}/lib/${ANDROID_ABI}/liblo-
COMMAND ${CMAKE_COMMAND} -E copy
${LOBUILDDIR_ABI}/instdir/program/libssl3.so
"${CMAKE_CURRENT_SOURCE_DIR}/lib/${ANDROID_ABI}"
DEPENDS ${LOBUILDDIR_ABI}/instdir/program/libssl3.so
- COMMAND ${CMAKE_COMMAND} -E copy
${LOBUILDDIR_ABI}/android/source/jniLibs/${ANDROID_ABI}/liblo-native-code.so
"${CMAKE_CURRENT_SOURCE_DIR}/lib/${ANDROID_ABI}"
- DEPENDS
${LOBUILDDIR_ABI}/android/source/jniLibs/${ANDROID_ABI}/liblo-native-code.so
+ COMMAND ${CMAKE_COMMAND} -E copy ${LIBLO_NATIVE_CODE}
"${CMAKE_CURRENT_SOURCE_DIR}/lib/${ANDROID_ABI}"
+ DEPENDS ${LIBLO_NATIVE_CODE}
COMMENT "Copied liblo-native-code.so and its dependencies
to the tree."
)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/nisz/libreoffice-6-4' - chart2/qa oox/source
chart2/qa/extras/chart2export.cxx | 14 ++
chart2/qa/extras/data/xlsx/auto_marker_excel10.xlsx |binary
oox/source/export/chartexport.cxx |2 +-
3 files changed, 15 insertions(+), 1 deletion(-)
New commits:
commit 48e33a8d34fdb82b01e80fe8889e49ee74aa83e7
Author: Tünde Tóth
AuthorDate: Tue Feb 11 15:16:34 2020 +0100
Commit: Gabor Kelemen
CommitDate: Thu Jun 11 18:21:42 2020 +0200
tdf#126076 XLSX export: fix automatic line chart markers
The default automatic line chart markers in XLSX spreadsheets
created with Microsoft Excel 2010 became squares after export.
Change-Id: I58a3e10212608a356eef8fbd1e100eda4dbebaca
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88461
Tested-by: László Németh
Reviewed-by: László Németh
(cherry picked from commit bae73c0726e7fdf7f427a8254c9d6d4b4c510daf)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96134
Tested-by: Gabor Kelemen
Reviewed-by: Gabor Kelemen
diff --git a/chart2/qa/extras/chart2export.cxx
b/chart2/qa/extras/chart2export.cxx
index 6826c3f53569..6c693be3cce5 100644
--- a/chart2/qa/extras/chart2export.cxx
+++ b/chart2/qa/extras/chart2export.cxx
@@ -152,6 +152,7 @@ public:
void testTdf123206_customLabelText();
void testCustomLabelText();
void testTdf131979();
+void testTdf126076();
CPPUNIT_TEST_SUITE(Chart2ExportTest);
CPPUNIT_TEST(testErrorBarXLSX);
@@ -267,6 +268,7 @@ public:
CPPUNIT_TEST(testTdf123206_customLabelText);
CPPUNIT_TEST(testCustomLabelText);
CPPUNIT_TEST(testTdf131979);
+CPPUNIT_TEST(testTdf126076);
CPPUNIT_TEST_SUITE_END();
@@ -2467,6 +2469,18 @@ void Chart2ExportTest::testTdf131979()
}
}
+void Chart2ExportTest::testTdf126076()
+{
+load("/chart2/qa/extras/data/xlsx/", "auto_marker_excel10.xlsx");
+xmlDocPtr pXmlDoc = parseExport("xl/charts/chart","Calc Office Open XML");
+CPPUNIT_ASSERT(pXmlDoc);
+
+// This was 12: all series exported with square markers
+assertXPath(pXmlDoc,
"/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:ser/c:marker/c:symbol[@val='square']",
0);
+// instead of skipping markers
+assertXPath(pXmlDoc,
"/c:chartSpace/c:chart/c:plotArea/c:lineChart/c:ser/c:marker", 0);
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(Chart2ExportTest);
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/chart2/qa/extras/data/xlsx/auto_marker_excel10.xlsx
b/chart2/qa/extras/data/xlsx/auto_marker_excel10.xlsx
new file mode 100644
index ..c15756257251
Binary files /dev/null and
b/chart2/qa/extras/data/xlsx/auto_marker_excel10.xlsx differ
diff --git a/oox/source/export/chartexport.cxx
b/oox/source/export/chartexport.cxx
index 623a03b8ac97..ab2628ec11dd 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -3711,7 +3711,7 @@ void ChartExport::exportMarker(const Reference<
XPropertySet >& xPropSet)
if( GetProperty( xPropSet, "Symbol" ) )
mAny >>= aSymbol;
-if(aSymbol.Style != chart2::SymbolStyle_STANDARD && aSymbol.Style !=
chart2::SymbolStyle_AUTO && aSymbol.Style != chart2::SymbolStyle_NONE)
+if(aSymbol.Style != chart2::SymbolStyle_STANDARD && aSymbol.Style !=
chart2::SymbolStyle_NONE)
return;
FSHelperPtr pFS = GetFS();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/gtk3/gtk3gtkframe.cxx |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 7ccfba06efaa28423accaeab9cd248fa0093f737 Author: Caolán McNamara AuthorDate: Thu Jun 11 12:32:23 2020 +0100 Commit: Caolán McNamara CommitDate: Thu Jun 11 18:21:12 2020 +0200 restore parent grab mode instead of assuming it should be false Change-Id: If20de104a058ef3bb5642cb4ecdb7c5c6f931efe Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96126 Tested-by: Caolán McNamara Reviewed-by: Caolán McNamara diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx index a8d33f80fbc2..5f2ec2a152b2 100644 --- a/vcl/unx/gtk3/gtk3gtkframe.cxx +++ b/vcl/unx/gtk3/gtk3gtkframe.cxx @@ -1356,7 +1356,8 @@ void GtkSalFrame::Show( bool bVisible, bool /*bNoActivate*/ ) removeGrabLevel(); grabPointer(false, true, false); m_pParent->removeGrabLevel(); -m_pParent->grabPointer(false, true, false); +bool bParentIsFloatGrabWindow = m_pParent->isFloatGrabWindow(); +m_pParent->grabPointer(bParentIsFloatGrabWindow, true, bParentIsFloatGrabWindow); } } gtk_widget_hide( m_pWindow ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: wsd/Storage.cpp wsd/Storage.hpp
wsd/Storage.cpp | 239 ++--
wsd/Storage.hpp | 95 +-
2 files changed, 120 insertions(+), 214 deletions(-)
New commits:
commit 33a5813d84f24910c36adc3615b0d017f13f6e4d
Author: Michael Meeks
AuthorDate: Thu Jun 11 15:54:27 2020 +0100
Commit: Michael Meeks
CommitDate: Thu Jun 11 17:38:32 2020 +0200
WOPI: pure re-factor, remove rampant duplication.
Dung out lots of pointless intermediate variables, and overly
verbose code. Vertical space is not a renewable resource.
Most variables had a consistent pattern, except these:
caller var c'tor parameter member name
Change-Id: I7910b713b8c4f6950b1e7be9c3a8e4eb4f54e249
--
userId userid _userId
userNameusername_username
canWriteuserCanWrite_userCanWriter
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/96129
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Michael Meeks
diff --git a/wsd/Storage.cpp b/wsd/Storage.cpp
index 95046acac..3960544c2 100644
--- a/wsd/Storage.cpp
+++ b/wsd/Storage.cpp
@@ -12,6 +12,7 @@
#include "Storage.hpp"
#include
+#include
#include
#include
#include
@@ -602,40 +603,6 @@ std::unique_ptr
WopiStorage::getWOPIFileInfo(const Au
LOG_ERR("Cannot get file info from WOPI storage uri [" << uriAnonym <<
"]. Error: Failed HTPP request authorization");
}
-// Parse the response.
-std::string filename;
-size_t size = 0;
-std::string ownerId;
-std::string userId;
-std::string userName;
-std::string obfuscatedUserId;
-std::string userExtraInfo;
-std::string watermarkText;
-std::string templateSaveAs;
-std::string templateSource;
-bool canWrite = false;
-bool enableOwnerTermination = false;
-std::string postMessageOrigin;
-bool hidePrintOption = false;
-bool hideSaveOption = false;
-bool hideExportOption = false;
-bool disablePrint = false;
-bool disableExport = false;
-bool disableCopy = false;
-bool disableInactiveMessages = false;
-bool downloadAsPostMessage = false;
-std::string lastModifiedTime;
-bool userCanNotWriteRelative = true;
-bool enableInsertRemoteImage = false;
-bool enableShare = false;
-bool supportsLocks = false;
-bool supportsRename = false;
-bool userCanRename = false;
-std::string hideUserList("false");
-WOPIFileInfo::TriState disableChangeTrackingRecord =
WOPIFileInfo::TriState::Unset;
-WOPIFileInfo::TriState disableChangeTrackingShow =
WOPIFileInfo::TriState::Unset;
-WOPIFileInfo::TriState hideChangeTrackingControls =
WOPIFileInfo::TriState::Unset;
-
Poco::JSON::Object::Ptr object;
if (JsonUtil::parseJSON(wopiResponse, object))
{
@@ -644,88 +611,26 @@ std::unique_ptr
WopiStorage::getWOPIFileInfo(const Au
else
LOG_DBG("WOPI::CheckFileInfo (" << callDuration.count() * 1000. <<
" ms): " << wopiResponse);
-JsonUtil::findJSONValue(object, "BaseFileName", filename);
+size_t size = 0;
+std::string filename, ownerId, lastModifiedTime;
+
+JsonUtil::findJSONValue(object, "Size", size);
JsonUtil::findJSONValue(object, "OwnerId", ownerId);
-JsonUtil::findJSONValue(object, "UserId", userId);
-JsonUtil::findJSONValue(object, "UserFriendlyName", userName);
-JsonUtil::findJSONValue(object, "TemplateSaveAs", templateSaveAs);
-JsonUtil::findJSONValue(object, "TemplateSource", templateSource);
+JsonUtil::findJSONValue(object, "BaseFileName", filename);
+JsonUtil::findJSONValue(object, "LastModifiedTime", lastModifiedTime);
+
+const std::chrono::system_clock::time_point modifiedTime =
Util::iso8601ToTimestamp(lastModifiedTime, "LastModifiedTime");
+FileInfo fileInfo = FileInfo({filename, ownerId, modifiedTime, size});
+setFileInfo(fileInfo);
-// Anonymize key values.
if (LOOLWSD::AnonymizeUserData)
-{
Util::mapAnonymized(Util::getFilenameFromURL(filename),
Util::getFilenameFromURL(getUri().toString()));
-JsonUtil::findJSONValue(object, "ObfuscatedUserId",
obfuscatedUserId, false);
-if (!obfuscatedUserId.empty())
-{
-Util::mapAnonymized(ownerId, obfuscatedUserId);
-Util::mapAnonymized(userId, obfuscatedUserId);
-Util::mapAnonymized(userName, obfuscatedUserId);
-}
-
-// Set anonymized version of the above fields before logging.
-// Note: anonymization caches the result, so we don't need to
store here.
-if (LOOLWSD::AnonymizeUserData)
-object->set("BaseFileName", LOOLWSD::anonymizeUrl(filename));
-
-// I
[Libreoffice-commits] core.git: dbaccess/source
dbaccess/source/ui/dlg/adodatalinks.cxx | 11 ++-
1 file changed, 6 insertions(+), 5 deletions(-)
New commits:
commit 5ea87cda46c1b4bd3f2f142d87e628f8cb4cdddb
Author: Mike Kaganski
AuthorDate: Thu Jun 11 15:31:17 2020 +0200
Commit: Mike Kaganski
CommitDate: Thu Jun 11 17:36:55 2020 +0200
Use comphelper::ScopeGuard to reliably uninitialize COM here
Change-Id: I60ccdf51731352b1749109a40c7ad61220a67d84
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96135
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
diff --git a/dbaccess/source/ui/dlg/adodatalinks.cxx
b/dbaccess/source/ui/dlg/adodatalinks.cxx
index 5792345ee61c..8ba7610fc854 100644
--- a/dbaccess/source/ui/dlg/adodatalinks.cxx
+++ b/dbaccess/source/ui/dlg/adodatalinks.cxx
@@ -24,6 +24,7 @@
#undef WB_RIGHT
#include
+#include
#include
#include
@@ -43,11 +44,13 @@ OUString PromptNew(long hWnd)
// Initialize COM
hr = ::CoInitializeEx( nullptr, COINIT_APARTMENTTHREADED );
-bool bDoUninit = true;
if (FAILED(hr) && hr != RPC_E_CHANGED_MODE)
std::abort();
-if (hr == RPC_E_CHANGED_MODE)
-bDoUninit = false;
+const bool bDoUninit = SUCCEEDED(hr);
+comphelper::ScopeGuard g([bDoUninit] () {
+if (bDoUninit)
+CoUninitialize();
+});
// Instantiate DataLinks object.
hr = CoCreateInstance(
@@ -88,8 +91,6 @@ OUString PromptNew(long hWnd)
piTmpConnection->Release( );
dlPrompt->Release( );
-if (bDoUninit)
-CoUninitialize();
// Don't we need SysFreeString(_result)?
return o3tl::toU(_result);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/nisz/libreoffice-6-4' - sw/qa sw/source writerfilter/source
sw/qa/extras/ooxmlexport/data/tdf130120.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport14.cxx|9 +++
sw/source/filter/ww8/docxsdrexport.cxx| 23 --
sw/source/filter/ww8/ww8graf.cxx |1
writerfilter/source/dmapper/GraphicImport.cxx | 14 ++
writerfilter/source/ooxml/OOXMLFastContextHandler.cxx | 19 ++
6 files changed, 62 insertions(+), 4 deletions(-)
New commits:
commit 24aff342ae648706b2f1ff0cdf1202e2d88067d9
Author: Bakos Attila
AuthorDate: Tue Feb 11 11:43:48 2020 +0100
Commit: Gabor Kelemen
CommitDate: Thu Jun 11 17:29:30 2020 +0200
tdf#130120 DOCX: export o:allowincell
Object anchors are set by allowincell/
LayoutInCell attributes in table cells.
Export it by grab bag method temporarily,
instead of using the suggested FollowTextFlow,
related also to the missing GUI support.
Follow-up of commit 14ad64270e4fbca3c24da6f55f260b1fb229556a
(tdf#129888 DOCX shape import: handle o:allowincell)
Change-Id: If883511b6114e8f60d673ecbd3a11095fcafddc5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88438
Tested-by: László Németh
Reviewed-by: László Németh
(cherry picked from commit ad8857dab30e099a0cf6ec18d184a6c836b33317)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96140
Tested-by: Gabor Kelemen
Reviewed-by: Gabor Kelemen
diff --git a/sw/qa/extras/ooxmlexport/data/tdf130120.docx
b/sw/qa/extras/ooxmlexport/data/tdf130120.docx
new file mode 100644
index ..5ca2adc76d60
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf130120.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
index 6561bbeb6cb8..8d347be29038 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
@@ -91,6 +91,15 @@ DECLARE_OOXMLIMPORT_TEST(testTdf129888dml,
"tdf129888dml.docx")
text::RelOrientation::PAGE_FRAME, nValue);
}
+DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf130120, "tdf130120.docx")
+{
+ //Text for exporting the allowincell attribute:
+xmlDocPtr p_XmlDoc = parseExport("word/document.xml");
+assertXPath(p_XmlDoc,
"/w:document/w:body/w:tbl/w:tr/w:tc/w:p/w:r/mc:AlternateContent/"
+ "mc:Choice/w:drawing/wp:anchor","layoutInCell","0");
+}
+
+
DECLARE_OOXMLEXPORT_TEST(testTdf87569v, "tdf87569_vml.docx")
{
//the original tdf87569 sample has vml shapes...
diff --git a/sw/source/filter/ww8/docxsdrexport.cxx
b/sw/source/filter/ww8/docxsdrexport.cxx
index 7cacc4eb3173..1663ab98e30e 100644
--- a/sw/source/filter/ww8/docxsdrexport.cxx
+++ b/sw/source/filter/ww8/docxsdrexport.cxx
@@ -31,8 +31,9 @@
#include
#include
#include
-
+#include
#include
+#include
using namespace com::sun::star;
using namespace oox;
@@ -469,7 +470,25 @@ void DocxSdrExport::startDMLAnchorInline(const
SwFrameFormat* pFrameFormat, cons
attrList->add(XML_distR, OString::number(nDistR).getStr());
attrList->add(XML_simplePos, "0");
attrList->add(XML_locked, "0");
-attrList->add(XML_layoutInCell, "1");
+bool bLclInTabCell = true;
+if (pObj)
+{
+uno::Reference
xShape((const_cast(pObj)->getUnoShape()),
+ uno::UNO_QUERY);
+uno::Sequence propList =
lclGetProperty(xShape, "InteropGrabBag");
+if (propList.hasElements())
+{
+auto pLclProp = std::find_if(
+std::begin(propList), std::end(propList),
+[](const beans::PropertyValue& rProp) { return rProp.Name
== "LayoutInCell"; });
+if (pLclProp && pLclProp != propList.end())
+pLclProp->Value >>= bLclInTabCell;
+}
+}
+if (bLclInTabCell)
+attrList->add(XML_layoutInCell, "1");
+else
+attrList->add(XML_layoutInCell, "0");
bool bAllowOverlap =
pFrameFormat->GetWrapInfluenceOnObjPos().GetAllowOverlap();
attrList->add(XML_allowOverlap, bAllowOverlap ? "1" : "0");
if (pObj != nullptr)
diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx
index a49d9dea7054..c622366bd954 100644
--- a/sw/source/filter/ww8/ww8graf.cxx
+++ b/sw/source/filter/ww8/ww8graf.cxx
@@ -2703,7 +2703,6 @@ SwFrameFormat* SwWW8ImplReader::Read_GrafLayer( long
nGrafAnchorCp )
SdrObject::Free(pObject);
return nullptr;
}
-
const bool bLayoutInTableCell =
m_nInTable && IsObjectLayoutInTableCell( pRecord->nLayoutInTableCell );
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx
b/writerfilter/source/dmapper/GraphicImport.cxx
index a2c19383c95d..174674ae46a0 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfi
[Libreoffice-commits] core.git: Branch 'distro/nisz/libreoffice-6-4' - sw/qa writerfilter/source
sw/qa/extras/ooxmlexport/data/tdf92472.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport14.cxx| 21 +
writerfilter/source/dmapper/DomainMapper_Impl.cxx |4 ++--
3 files changed, 23 insertions(+), 2 deletions(-)
New commits:
commit 025ff5782fa199932871a8ec18491bbb11751bda
Author: László Németh
AuthorDate: Fri Feb 28 16:55:23 2020 +0100
Commit: Gabor Kelemen
CommitDate: Thu Jun 11 17:11:28 2020 +0200
tdf#92472 DOCX import: fix checkbox size set by direct formatting
at beginning of paragraphs.
Follow-up of the commit 22ad4d69d771708f28a2d9e137cfd43ac846cf3a
(tdf#121045 DOCX import: fix checkbox size in table).
Change-Id: I06f0dfa4376ff8f5730d8cfe1cbc3de022e8aaff
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89726
Tested-by: Jenkins
Tested-by: László Németh
Reviewed-by: László Németh
(cherry picked from commit 294babdbbe0a10c732cd5247c5636638c97a4c30)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96141
Tested-by: Gabor Kelemen
Reviewed-by: Gabor Kelemen
diff --git a/sw/qa/extras/ooxmlexport/data/tdf92472.docx
b/sw/qa/extras/ooxmlexport/data/tdf92472.docx
new file mode 100644
index ..6cf2b50e9103
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf92472.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
index 7c64edb83f74..6561bbeb6cb8 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
@@ -160,6 +160,27 @@ DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf121045,
"tdf121045.docx")
assertXPath(pXmlDoc,
"/w:document/w:body/w:tbl/w:tr/w:tc[1]/w:p/w:r[5]/w:rPr/w:szCs", "val", "20");
}
+DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf92472, "tdf92472.docx")
+{
+xmlDocPtr pXmlDoc = parseExport("word/document.xml");
+CPPUNIT_ASSERT(pXmlDoc);
+assertXPath(pXmlDoc, "/w:document/w:body/w:p[2]/w:pPr/w:rPr/w:sz", "val",
"20");
+assertXPath(pXmlDoc, "/w:document/w:body/w:p[2]/w:pPr/w:rPr/w:szCs",
"val", "20");
+assertXPath(pXmlDoc, "/w:document/w:body/w:p[2]/w:r[1]/w:fldChar",
"fldCharType", "begin");
+assertXPath(pXmlDoc, "/w:document/w:body/w:p[2]/w:r[2]/w:instrText", 1);
+assertXPath(pXmlDoc, "/w:document/w:body/w:p[2]/w:r[3]/w:fldChar",
"fldCharType", "separate");
+assertXPath(pXmlDoc, "/w:document/w:body/w:p[2]/w:r[5]/w:fldChar",
"fldCharType", "end");
+// form control keeps its direct formatted font size
+assertXPath(pXmlDoc, "/w:document/w:body/w:p[2]/w:r[2]/w:rPr/w:sz", "val",
"20");
+assertXPath(pXmlDoc, "/w:document/w:body/w:p[2]/w:r[2]/w:rPr/w:szCs",
"val", "20");
+assertXPath(pXmlDoc, "/w:document/w:body/w:p[2]/w:r[3]/w:rPr/w:sz", "val",
"20");
+assertXPath(pXmlDoc, "/w:document/w:body/w:p[2]/w:r[3]/w:rPr/w:szCs",
"val", "20");
+assertXPath(pXmlDoc, "/w:document/w:body/w:p[2]/w:r[4]/w:rPr/w:sz", "val",
"20");
+assertXPath(pXmlDoc, "/w:document/w:body/w:p[2]/w:r[4]/w:rPr/w:szCs",
"val", "20");
+assertXPath(pXmlDoc, "/w:document/w:body/w:p[2]/w:r[5]/w:rPr/w:sz", "val",
"20");
+assertXPath(pXmlDoc, "/w:document/w:body/w:p[2]/w:r[5]/w:rPr/w:szCs",
"val", "20");
+}
+
DECLARE_OOXMLEXPORT_TEST(testTdf120315, "tdf120315.docx")
{
// tdf#120315 cells of the second column weren't vertically merged
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index f2234f38b37f..b3357d97fb45 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -4622,8 +4622,8 @@ void DomainMapper_Impl::CloseFieldCommand()
OUString const sFirstParam(std::get<1>(field).empty()
? OUString() : std::get<1>(field).front());
-// apply font size to the form control in tables
-if ( m_nTableDepth > 0 && m_pLastCharacterContext.get() &&
m_pLastCharacterContext->isSet(PROP_CHAR_HEIGHT) )
+// apply font size to the form control
+if ( m_pLastCharacterContext.get() &&
m_pLastCharacterContext->isSet(PROP_CHAR_HEIGHT) )
{
uno::Reference< text::XTextAppend > xTextAppend =
m_aTextAppendStack.top().xTextAppend;
if (xTextAppend.is())
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/nisz/libreoffice-6-4' - sw/qa sw/source
sw/qa/extras/uiwriter/uiwriter.cxx | 22 ++
sw/source/core/doc/DocumentStylePoolManager.cxx |5 +
2 files changed, 27 insertions(+)
New commits:
commit 0bd1b767e906c74ba7957ec40cf299daa596c0d1
Author: László Németh
AuthorDate: Thu Jan 30 11:26:58 2020 +0100
Commit: Gabor Kelemen
CommitDate: Thu Jun 11 17:06:57 2020 +0200
tdf#130287 disable orphan/widow control in Table Contents
paragraph style to avoid missing text lines later
in vertically merged table cells at page break.
From commit 49f453755b72654ba454acc321210e8b040df714
("tdf#89714 - enable Widow/Orphan in default style"),
Table Contents got unnecessary orphan/window
control. Unfortunately, recent table layout code
cannot ignore these settings completely, causing known
problems, see for example tdf#128959 (FILEOPEN DOCX
Table row content disappears when broken between pages).
Change-Id: Idd570f17b0a11af85072a65f3422535b993db306
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87730
Tested-by: Jenkins
Reviewed-by: László Németh
Tested-by: László Németh
(cherry picked from commit c81d766dd4ff7d8b580b7fdc79db6e68c5f14204)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96108
Tested-by: Gabor Kelemen
Reviewed-by: Gabor Kelemen
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx
b/sw/qa/extras/uiwriter/uiwriter.cxx
index eacde2daf67d..19ab8f78792b 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -244,6 +244,7 @@ public:
void testTdf75137();
void testTdf83798();
void testTdf89714();
+void testTdf130287();
void testPropertyDefaults();
void testTableBackgroundColor();
void testTdf88899();
@@ -451,6 +452,7 @@ public:
CPPUNIT_TEST(testTdf75137);
CPPUNIT_TEST(testTdf83798);
CPPUNIT_TEST(testTdf89714);
+CPPUNIT_TEST(testTdf130287);
CPPUNIT_TEST(testPropertyDefaults);
CPPUNIT_TEST(testTableBackgroundColor);
CPPUNIT_TEST(testTdf88899);
@@ -3613,6 +3615,26 @@ void SwUiWriterTest::testTdf89714()
CPPUNIT_ASSERT_EQUAL( uno::makeAny(sal_Int8(2)),
xPropState->getPropertyDefault("ParaWidows") );
}
+void SwUiWriterTest::testTdf130287()
+{
+//create a new writer document
+SwDoc* pDoc = createDoc();
+SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
+//insert a 1-cell table in the newly created document
+SwInsertTableOptions TableOpt(SwInsertTableFlags::DefaultBorder, 0);
+pWrtShell->InsertTable(TableOpt, 1, 1);
+//checking for the row and column
+uno::Reference xTable(getParagraphOrTable(1),
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xTable->getRows()->getCount());
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xTable->getColumns()->getCount());
+uno::Reference xCell = xTable->getCellByName("A1");
+uno::Reference xCellText(xCell, uno::UNO_QUERY);
+uno::Reference xParagraph = getParagraphOfText(1,
xCellText);
+// they were 2 (orphan/widow control enabled unnecessarily in Table
Contents paragraph style)
+CPPUNIT_ASSERT_EQUAL( sal_Int8(0), getProperty(xParagraph,
"ParaOrphans"));
+CPPUNIT_ASSERT_EQUAL( sal_Int8(0), getProperty(xParagraph,
"ParaWidows"));
+}
+
void SwUiWriterTest::testPropertyDefaults()
{
createDoc();
diff --git a/sw/source/core/doc/DocumentStylePoolManager.cxx
b/sw/source/core/doc/DocumentStylePoolManager.cxx
index 767af3a22010..b1fb4debf892 100644
--- a/sw/source/core/doc/DocumentStylePoolManager.cxx
+++ b/sw/source/core/doc/DocumentStylePoolManager.cxx
@@ -798,6 +798,11 @@ SwTextFormatColl*
DocumentStylePoolManager::GetTextCollFromPool( sal_uInt16 nId,
SwFormatLineNumber aLN;
aLN.SetCountLines( false );
aSet.Put( aLN );
+if (nId == RES_POOLCOLL_TABLE)
+{
+aSet.Put( SvxWidowsItem( 0, RES_PARATR_WIDOWS ) );
+aSet.Put( SvxOrphansItem( 0, RES_PARATR_ORPHANS ) );
+}
}
break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/nisz/libreoffice-6-4' - sw/qa writerfilter/source
sw/qa/extras/ooxmlexport/data/tdf121045.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport14.cxx| 21 +
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 19 +++
3 files changed, 40 insertions(+)
New commits:
commit 2b644016116337f106d988b459e530489b3a93e8
Author: László Németh
AuthorDate: Mon Feb 24 10:55:38 2020 +0100
Commit: Gabor Kelemen
CommitDate: Thu Jun 11 17:06:26 2020 +0200
tdf#121045 DOCX import: fix checkbox size in table
in cell starting position.
Change-Id: Ib99726c03ff3f83177a015721e562ebc5bc516d3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89338
Tested-by: Jenkins
Tested-by: László Németh
Reviewed-by: László Németh
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96133
Tested-by: Gabor Kelemen
Reviewed-by: Gabor Kelemen
diff --git a/sw/qa/extras/ooxmlexport/data/tdf121045.docx
b/sw/qa/extras/ooxmlexport/data/tdf121045.docx
new file mode 100644
index ..271aca1ec0a6
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf121045.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
index 09a179eb2bb0..7c64edb83f74 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
@@ -139,6 +139,27 @@ DECLARE_OOXMLEXPORT_TEST(testTdf130610,
"tdf130610_bold_in_2_styles.ott")
}
}
+DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf121045, "tdf121045.docx")
+{
+xmlDocPtr pXmlDoc = parseExport("word/document.xml");
+CPPUNIT_ASSERT(pXmlDoc);
+assertXPath(pXmlDoc,
"/w:document/w:body/w:tbl/w:tr/w:tc[1]/w:p/w:pPr/w:rPr/w:sz", "val", "20");
+assertXPath(pXmlDoc,
"/w:document/w:body/w:tbl/w:tr/w:tc[1]/w:p/w:pPr/w:rPr/w:szCs", "val", "20");
+assertXPath(pXmlDoc,
"/w:document/w:body/w:tbl/w:tr/w:tc[1]/w:p/w:r[1]/w:fldChar", "fldCharType",
"begin");
+assertXPath(pXmlDoc,
"/w:document/w:body/w:tbl/w:tr/w:tc[1]/w:p/w:r[2]/w:instrText", 1);
+assertXPath(pXmlDoc,
"/w:document/w:body/w:tbl/w:tr/w:tc[1]/w:p/w:r[3]/w:fldChar", "fldCharType",
"separate");
+assertXPath(pXmlDoc,
"/w:document/w:body/w:tbl/w:tr/w:tc[1]/w:p/w:r[5]/w:fldChar", "fldCharType",
"end");
+// form control keeps its direct formatted font size
+assertXPath(pXmlDoc,
"/w:document/w:body/w:tbl/w:tr/w:tc[1]/w:p/w:r[2]/w:rPr/w:sz", "val", "20");
+assertXPath(pXmlDoc,
"/w:document/w:body/w:tbl/w:tr/w:tc[1]/w:p/w:r[2]/w:rPr/w:szCs", "val", "20");
+assertXPath(pXmlDoc,
"/w:document/w:body/w:tbl/w:tr/w:tc[1]/w:p/w:r[3]/w:rPr/w:sz", "val", "20");
+assertXPath(pXmlDoc,
"/w:document/w:body/w:tbl/w:tr/w:tc[1]/w:p/w:r[3]/w:rPr/w:szCs", "val", "20");
+assertXPath(pXmlDoc,
"/w:document/w:body/w:tbl/w:tr/w:tc[1]/w:p/w:r[4]/w:rPr/w:sz", "val", "20");
+assertXPath(pXmlDoc,
"/w:document/w:body/w:tbl/w:tr/w:tc[1]/w:p/w:r[4]/w:rPr/w:szCs", "val", "20");
+assertXPath(pXmlDoc,
"/w:document/w:body/w:tbl/w:tr/w:tc[1]/w:p/w:r[5]/w:rPr/w:sz", "val", "20");
+assertXPath(pXmlDoc,
"/w:document/w:body/w:tbl/w:tr/w:tc[1]/w:p/w:r[5]/w:rPr/w:szCs", "val", "20");
+}
+
DECLARE_OOXMLEXPORT_TEST(testTdf120315, "tdf120315.docx")
{
// tdf#120315 cells of the second column weren't vertically merged
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 87322694cbd4..f2234f38b37f 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -4622,6 +4622,25 @@ void DomainMapper_Impl::CloseFieldCommand()
OUString const sFirstParam(std::get<1>(field).empty()
? OUString() : std::get<1>(field).front());
+// apply font size to the form control in tables
+if ( m_nTableDepth > 0 && m_pLastCharacterContext.get() &&
m_pLastCharacterContext->isSet(PROP_CHAR_HEIGHT) )
+{
+uno::Reference< text::XTextAppend > xTextAppend =
m_aTextAppendStack.top().xTextAppend;
+if (xTextAppend.is())
+{
+uno::Reference< text::XTextCursor > xCrsr =
xTextAppend->getText()->createTextCursor();
+uno::Reference< text::XText > xText =
xTextAppend->getText();
+if(xCrsr.is() && xText.is())
+{
+xCrsr->gotoEnd(false);
+uno::Reference< beans::XPropertySet > xProp( xCrsr,
uno::UNO_QUERY );
+
xProp->setPropertyValue(getPropertyName(PROP_CHAR_HEIGHT),
m_pLastCharacterContext->getProperty(PROP_CHAR_HEIGHT)->second);
+if (
m_pLastCharacterContext->isSet(PROP_CHAR_HEIGHT_COMPLEX) )
+
xProp->setPropertyValue(getPropertyName(PROP_CHAR_HEIGHT_COMPLEX),
m_pLastCharacterContext->getProperty(PROP_CHAR_HEIGHT_COMPLEX)->second);
+}
[Libreoffice-commits] core.git: instsetoo_native/inc_openoffice
instsetoo_native/inc_openoffice/windows/msi_templates/RadioBut.idt |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit eaf30f98597f12c53d734935d62a84501cb201b4 Author: Roman Kuznetsov AuthorDate: Tue Jun 9 16:25:00 2020 +0200 Commit: Roman Kuznetsov CommitDate: Thu Jun 11 16:56:33 2020 +0200 increase a radiobutton text area in Windows installer dialog Change-Id: I3e2a2dbb7913bc0e35f0eb676f39afba53e1d0d8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95970 Tested-by: Jenkins Reviewed-by: Mike Kaganski diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/RadioBut.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/RadioBut.idt index c0425876b93f..680c97605409 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/RadioBut.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/RadioBut.idt @@ -10,5 +10,5 @@ AgreeToLicense1 No 0 15 295 15 OOO_RADIOBUTTON_6 AgreeToLicense 2 Yes 0 0 295 15 OOO_RADIOBUTTON_7 ApplicationUsers 1 AllUsers1 7 290 14 OOO_RADIOBUTTON_8 ApplicationUsers 2 OnlyCurrentUser 1 23 290 14 OOO_RADIOBUTTON_9 -MsiUIRMOption 1 UseRM 0 0 295 16 OOO_RADIOBUTTON_10 -MsiUIRMOption 2 DontUseRM 0 20 295 16 OOO_RADIOBUTTON_11 +MsiUIRMOption 1 UseRM 0 0 420 16 OOO_RADIOBUTTON_10 +MsiUIRMOption 2 DontUseRM 0 20 420 16 OOO_RADIOBUTTON_11 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - configure.ac
configure.ac |1 + 1 file changed, 1 insertion(+) New commits: commit d4e71e2d5088f61250748c92a10ec31fb40d6adf Author: Henry Castro AuthorDate: Wed Jun 3 20:18:58 2020 -0400 Commit: Henry Castro CommitDate: Thu Jun 11 16:38:21 2020 +0200 lok: symbolic link to the "include" directory when builddir != srcdir When compiling the android variant build in a different build output directory of the "online" project, it fails due to the missing "include" files. Change-Id: If9056788b3d043e4ae8ad3f799885995c0ab0cf0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95603 Tested-by: Jenkins CollaboraOffice Reviewed-by: Henry Castro diff --git a/configure.ac b/configure.ac index 5bbb00efe8f4..be9851960312 100644 --- a/configure.ac +++ b/configure.ac @@ -12973,6 +12973,7 @@ CFLAGS=$my_original_CFLAGS CXXFLAGS=$my_original_CXXFLAGS CPPFLAGS=$my_original_CPPFLAGS +AC_LINK_FILES([include], [include]) AC_CONFIG_FILES([config_host.mk config_host_lang.mk Makefile ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - filter/source sw/sdi sw/source
filter/source/pdf/impdialog.cxx|2 ++
sw/sdi/_basesh.sdi |1 +
sw/source/uibase/shells/basesh.cxx |7 +++
3 files changed, 10 insertions(+)
New commits:
commit 520e076e2d1750c1cced7edf8356bf74664f0ecc
Author: Tomaž Vajngerl
AuthorDate: Wed Jun 10 16:32:33 2020 +0200
Commit: Tomaž Vajngerl
CommitDate: Thu Jun 11 16:33:11 2020 +0200
Make AccessibilityCheck experimental
Change-Id: I3d9065a46483ea3f862f11ab6049256cb24c03ba
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96033
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl
diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx
index 31f712c47edf..ec09ea39944b 100644
--- a/filter/source/pdf/impdialog.cxx
+++ b/filter/source/pdf/impdialog.cxx
@@ -516,6 +516,8 @@ ImpPDFTabGeneralPage::ImpPDFTabGeneralPage(weld::Container*
pPage, weld::DialogC
, mxSlidesFt(m_xBuilder->weld_label("slides"))
, mxSheetsFt(m_xBuilder->weld_label("selectedsheets"))
{
+if (!officecfg::Office::Common::Misc::ExperimentalMode::get())
+mxCbPDFUA->set_visible(false);
}
ImpPDFTabGeneralPage::~ImpPDFTabGeneralPage()
diff --git a/sw/sdi/_basesh.sdi b/sw/sdi/_basesh.sdi
index 9726bcd44f81..0c3362aebc43 100644
--- a/sw/sdi/_basesh.sdi
+++ b/sw/sdi/_basesh.sdi
@@ -590,6 +590,7 @@ interface BaseTextSelection
SID_ACCESSIBILITY_CHECK
[
ExecMethod = ExecDlg;
+StateMethod = GetState;
DisableFlags="SfxDisableFlags::SwOnProtectedCursor";
]
}
diff --git a/sw/source/uibase/shells/basesh.cxx
b/sw/source/uibase/shells/basesh.cxx
index 64fd150e1700..2265ea10bb2a 100644
--- a/sw/source/uibase/shells/basesh.cxx
+++ b/sw/source/uibase/shells/basesh.cxx
@@ -91,6 +91,7 @@
#include
#include
#include
+#include
#include
@@ -1851,6 +1852,12 @@ void SwBaseShell::GetState( SfxItemSet &rSet )
else
rSet.Put( SfxVisibilityItem( nWhich, false ) );
break;
+case SID_ACCESSIBILITY_CHECK:
+{
+if (!officecfg::Office::Common::Misc::ExperimentalMode::get())
+rSet.Put(SfxVisibilityItem(nWhich, false));
+}
+break;
}
nWhich = aIter.NextWhich();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
ESC meeting minutes: 2020-06-11
* Present: + Heiko, Gabriel, Caolán, Cloph, Ilmari, Kendy, Sophie, Stephan, Olivier, Eike, Michael S., Xisco, René, Thorsten * Completed Action Items: + None * Pending Action Items: + fix Jenkins_Callgrind at some stage (Cloph) [ must be an env var mismatch, custom LD_LIBRARY_PATH causes problems ] + build an ODF filter commit list + names, who need to file their extensions in the wiki (Thorsten) * Release Engineering update (Cloph) + 7.0 status + UI freeze & string freeze in the first week of July + decide this week: if a beta2 is needed (so far nobody asked for it) + In the end we will have beta2, due to langpack situation on Mac (tdf#133511) + not necessary to revert the whole work, there's an easy fix (Cloph) https://gerrit.libreoffice.org/c/core/+/94623 / 95563 + there will be 3 RCs (Cloph) + 6.4 status + 6.4.5 RC1 released yesterday, uploading + RC2 in a week + Remotes + A new release due to release soon, f-droid too (Cloph) + Android viewer + Online + libreoffice-7-0 branch is created (Andras) * Documentation (Olivier) + New Help + No news + Help content + Updates, fixes and new pages (buovjaga, ohallot, LibreOfficiant, G. Kelemen, ..) + Google seasons of Doc + Tech writer application submission started (ends July 9th) + Guides + Released Draw Guide 6.4 (P.Schofield, C. Wood, Regina Henschel) * UX Update (Heiko) + Bugzilla (topicUI) statistics 243(243) (topicUI) bugs open, 262(262) (needsUXEval) needs to be evaluated by the UXteam + Updates: BZ changes 1 week 1 month3 months 12 months added 8(-3)22(-9) 48(-39)171(-10) commented 95(24) 368(-18) 989(-16) 3504(18) removed 0(0) 2(0) 7(-30) 46(0) resolved 19(12)53(3) 134(8) 358(13) + top 10 contributors: Heiko Tietze made 222 changes in 1 month, and 2030 changes in 1 year Telesto made 117 changes in 1 month, and 236 changes in 1 year Foote, V Stuart made 70 changes in 1 month, and 620 changes in 1 year Kainz, Andreas made 50 changes in 1 month, and 467 changes in 1 year Dieter Praas made 48 changes in 1 month, and 534 changes in 1 year BogdanB made 47 changes in 1 month, and 75 changes in 1 year Ilmari Lauhakangas made 24 changes in 1 month, and 133 changes in 1 year Xisco Fauli made 22 changes in 1 month, and 568 changes in 1 year Eyal Rozenberg made 13 changes in 1 month, and 32 changes in 1 year Michel Le Bihan made 13 changes in 1 month, and 13 changes in 1 year + New tickets with needsUXEval Jun/04-Jun/11 + 18 new tickets (https://bugs.documentfoundation.org/buglist.cgi?chfield=%5BBug%20creation%5D&chfieldfrom=7d&keywords=needsUXEval with keyword remaining) + Issue around new Gallery content + https://bugs.documentfoundation.org/show_bug.cgi?id=133788 (l10n) + https://bugs.documentfoundation.org/show_bug.cgi?id=133777 (present) + new content now at presets/gallery/ => move back to (readonly) share/gallery/ (sberg) + shipped content in user space would be overridden anyway (mikek) + better approach, eg. migration or as bundled extensions? + https://bugs.documentfoundation.org/show_bug.cgi?id=57466 (user space) + proposal in c19 with renaming to *.old + similar to extensions (René) + some people have very old ones (René) + issue also for table styles (Heiko) + Is there a diffirent solution? Like migration? (Heiko) + How to solve it for galleries? (Heiko) + Ideas much appreciated (Heiko) + User shouldn't modify existing galleries, just add new ones (René) => Please check the issues above, ideas much appreciated (Heiko) + Suggest staying with non-editable gallery content for 7.0 (René, Stephan) => let's do that, not enough time for 7.0 for larger changes + for later, we can ask the user (Heiko) + but the package installation cannot do anything in the user's dir (René) + bundled extensions are OK (René) * Crash Testing (Caolan) + 7(-8) import failure, 9(+4) export failures - mst fix #1 included above, and new build wih fix #2 underway + 1 coverity issues, but not getting updated - coverity admin contacted wrt timeouts, limit maybe extended + 8 oss-fuzz issues (6 timeouts) * Crash Reporting (Xisco) + https://crashreport.libreoffice.org/stats/version/6.3.6.2 + (+382) 1758 1376 858 668 529 283 0 + https://crashreport.libreoffice.org/stats/version/6.4.2.2 + (-377) 2354 2731 3033 3501 3702 4322 5765 6869 6527 8046 6988 3716 0 + https://crashre
Re: Help- How to select a cell programatically using Java in LibreOffice calc
Hello, I can write like this in StarBasic, but the behavior is a bit strange. SelectionOverlay doesn't seem to be updated. REM * BASIC * Option Explicit Sub Main Dim selectionsupplier selectionsupplier = ThisComponent.getCurrentController() selectionsupplier.select(ThisComponent.getSheets().getByIndex(0).getCellRangeByPosition(1,1,2,2)) End Sub -- himajin10 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'distro/nisz/libreoffice-6-4' - sw/qa writerfilter/source
sw/qa/extras/layout/data/tdf128959.docx |binary
sw/qa/extras/layout/layout.cxx| 21 +
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 10 --
3 files changed, 29 insertions(+), 2 deletions(-)
New commits:
commit feb2aed404d102475a9d46ff9588bde7fcbabf4b
Author: László Németh
AuthorDate: Tue Jan 28 14:32:54 2020 +0100
Commit: Gabor Kelemen
CommitDate: Thu Jun 11 16:28:35 2020 +0200
tdf#128959 DOCX import: fix missing text lines in tables
Orphan/widow line break settings aren't always ignored
by Writer table layout code, in this case, in vertically
merged cells, resulting missing paragraph lines.
As a workaround for interoperability, disable orphan/widow
control in cell paragraphs during the DOCX import to get
correct layout in Writer, too.
Change-Id: I48fdb0a3bb421fd4df2c729e307a7ef483e3e772
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87637
Reviewed-by: László Németh
Tested-by: László Németh
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96107
Tested-by: Gabor Kelemen
Reviewed-by: Gabor Kelemen
diff --git a/sw/qa/extras/layout/data/tdf128959.docx
b/sw/qa/extras/layout/data/tdf128959.docx
new file mode 100644
index ..f22f66504478
Binary files /dev/null and b/sw/qa/extras/layout/data/tdf128959.docx differ
diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx
index e33eaf66e108..790d3485a337 100644
--- a/sw/qa/extras/layout/layout.cxx
+++ b/sw/qa/extras/layout/layout.cxx
@@ -3749,6 +3749,27 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf117982)
//the source document.
}
+CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf128959)
+{
+// no orphan/widow control in table cells
+SwDoc* pDocument = createDoc("tdf128959.docx");
+CPPUNIT_ASSERT(pDocument);
+discardDumpedLayout();
+xmlDocPtr pXmlDoc = parseLayoutDump();
+
+// first two lines of the paragraph in the split table cell on the first
page
+// (these lines were completely lost)
+assertXPath(
+pXmlDoc,
"/root/page[1]/body/tab[1]/row[1]/cell[1]/txt[1]/LineBreak[1]", "Line",
+"a)Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Maecenas
porttitor congue ");
+assertXPath(
+pXmlDoc,
"/root/page[1]/body/tab[1]/row[1]/cell[1]/txt[1]/LineBreak[2]", "Line",
+"massa. Fusce posuere, magna sed pulvinar ultricies, purus lectus
malesuada libero, sit ");
+// last line of the paragraph in the split table cell on the second page
+assertXPath(pXmlDoc,
"/root/page[2]/body/tab[1]/row[1]/cell[1]/txt[1]/LineBreak[1]", "Line",
+"amet commodo magna eros quis urna.");
+}
+
static SwRect lcl_getVisibleFlyObjRect(SwWrtShell* pWrtShell)
{
SwRootFrame* pRoot = pWrtShell->GetLayout();
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 666bd9b46ffb..87322694cbd4 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -1786,17 +1786,23 @@ void DomainMapper_Impl::finishParagraph( const
PropertyMapPtr& pPropertyMap, con
}
}
-// tdf#90069 in tables, apply paragraph level character style
also on
-// paragraph level to support its copy during insertion of new
table rows
+// fix table paragraph properties
if ( xParaProps && m_nTableDepth > 0 )
{
uno::Sequence< beans::PropertyValue > aValues =
pParaContext->GetPropertyValues(false);
+// tdf#90069 in tables, apply paragraph level character
style also on
+// paragraph level to support its copy during insertion of
new table rows
for( const auto& rProp : std::as_const(aValues) )
{
if ( rProp.Name.startsWith("Char") && rProp.Name !=
"CharStyleName" && rProp.Name != "CharInteropGrabBag" )
xParaProps->setPropertyValue( rProp.Name,
rProp.Value );
}
+
+// tdf#128959 table paragraphs haven't got window and
orphan controls
+uno::Any aAny = uno::makeAny(static_cast(0));
+xParaProps->setPropertyValue("ParaOrphans", aAny);
+xParaProps->setPropertyValue("ParaWidows", aAny);
}
}
if( !bKeepLastParagraphProperties )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: uitest/writer_tests8
uitest/writer_tests8/customizeDialog.py | 15 +++
1 file changed, 15 insertions(+)
New commits:
commit 4407ee148ca5b44a66b212b9c89d9f0e602f0f00
Author: Xisco Fauli
AuthorDate: Thu Jun 11 11:33:53 2020 +0200
Commit: Xisco Fauli
CommitDate: Thu Jun 11 16:24:22 2020 +0200
tdf#133862: sw: Add UItest
Change-Id: Id08dc6fbbdb59888ecab29e922d84db75f97e779
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96087
Tested-by: Jenkins
Reviewed-by: Xisco Fauli
diff --git a/uitest/writer_tests8/customizeDialog.py
b/uitest/writer_tests8/customizeDialog.py
index 92fddfdff3b4..dfc6ae771e1b 100644
--- a/uitest/writer_tests8/customizeDialog.py
+++ b/uitest/writer_tests8/customizeDialog.py
@@ -89,4 +89,19 @@ class ConfigureDialog(UITestCase):
self.ui_test.close_doc()
+def test_tdf133862(self):
+self.ui_test.create_doc_in_start_center("writer")
+
+self.xUITest.executeCommand(".uno:InsertObjectStarMath")
+
+# Without the fix in place, calling customize dialog after inserting
+# a formula object would crash
+self.ui_test.execute_dialog_through_command(".uno:ConfigureDialog")
+xDialog = self.xUITest.getTopFocusWindow()
+
+xcancBtn = xDialog.getChild("cancel")
+xcancBtn.executeAction("CLICK", tuple())
+
+self.ui_test.close_doc()
+
# 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: config_host/config_libnumbertext.h.in config_host.mk.in configure.ac external/libnumbertext lingucomponent/source RepositoryExternal.mk svl/CppunitTest_svl_qa_cppunit.m
RepositoryExternal.mk | 12 - config_host.mk.in |1 config_host/config_libnumbertext.h.in | 17 configure.ac| 51 +++- external/libnumbertext/Module_libnumbertext.mk |4 - lingucomponent/source/numbertext/numbertext.cxx | 18 svl/CppunitTest_svl_qa_cppunit.mk |6 -- svl/qa/unit/svl.cxx |3 - sw/qa/extras/uiwriter/uiwriter.cxx |7 --- 9 files changed, 19 insertions(+), 100 deletions(-) New commits: commit c392ecfa734731194c366e869a3c2475c53dc867 Author: Tor Lillqvist AuthorDate: Thu Jun 11 14:02:57 2020 +0300 Commit: Tor Lillqvist CommitDate: Thu Jun 11 16:23:52 2020 +0200 Drop configurability of libnumbertext use It was fairly pointless to be able to --disable-libnumbertext. Besides, disabling it broke the ordinal page (etc) numbering feature: "1st", "2nd", "3rd", etc showed up as "Ordinal-number 1", "Ordinal-number 2", "Ordinal-number 3" etc. Change-Id: I645169054a8fdc8dac89cd48b6c369fd61749467 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96119 Tested-by: Jenkins Reviewed-by: Tor Lillqvist diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 81a65a1a8590..2255d1965382 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -830,8 +830,6 @@ endef else # !SYSTEM_LIBNUMBERTEXT -ifneq ($(ENABLE_LIBNUMBERTEXT),) - $(eval $(call gb_Helper_register_packages_for_install,ooo, \ libnumbertext_numbertext \ )) @@ -842,9 +840,6 @@ $(call gb_LinkTarget_set_include,$(1),\ -I$(call gb_UnpackedTarball_get_dir,libnumbertext/src) \ $$(INCLUDE) \ ) -$(call gb_LinkTarget_add_defs,$(1),\ - -DENABLE_LIBNUMBERTEXT \ -) ifeq ($(COM),MSC) $(call gb_LinkTarget_use_static_libraries,$(1),\ @@ -861,13 +856,6 @@ endif endef -else # !ENABLE_LIBNUMBERTEXT - -define gb_LinkTarget__use_libnumbertext -endef - -endif # ENABLE_LIBNUMBERTEXT - endif # SYSTEM_LIBNUMBERTEXT diff --git a/config_host.mk.in b/config_host.mk.in index f59b51d8f652..3f7bbb06ce60 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -360,7 +360,6 @@ export LIBLAYOUT_JAR=@LIBLAYOUT_JAR@ export LIBLOADER_JAR=@LIBLOADER_JAR@ export LIBNUMBERTEXT_CFLAGS=$(gb_SPACE)@LIBNUMBERTEXT_CFLAGS@ export LIBNUMBERTEXT_LIBS=$(gb_SPACE)@LIBNUMBERTEXT_LIBS@ -export ENABLE_LIBNUMBERTEXT=@ENABLE_LIBNUMBERTEXT@ export LIBO_BIN_FOLDER=@LIBO_BIN_FOLDER@ export LIBO_BIN_FOLDER_FOR_BUILD=@LIBO_BIN_FOLDER_FOR_BUILD@ export LIBO_ETC_FOLDER=@LIBO_ETC_FOLDER@ diff --git a/config_host/config_libnumbertext.h.in b/config_host/config_libnumbertext.h.in deleted file mode 100644 index de757806a104.. --- a/config_host/config_libnumbertext.h.in +++ /dev/null @@ -1,17 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -#ifndef INCLUDED_CONFIG_LIBNUMBERTEXT_H -#define INCLUDED_CONFIG_LIBNUMBERTEXT_H - -#define ENABLE_LIBNUMBERTEXT 0 - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/configure.ac b/configure.ac index 38cef8b899f2..553402e33515 100644 --- a/configure.ac +++ b/configure.ac @@ -1225,10 +1225,6 @@ libo_FUZZ_ARG_ENABLE(ooenv, AS_HELP_STRING([--disable-ooenv], [Disable ooenv for the instdir installation.])) -libo_FUZZ_ARG_ENABLE(libnumbertext, -AS_HELP_STRING([--disable-libnumbertext], -[Disable use of numbertext external library.])) - AC_ARG_ENABLE(lto, AS_HELP_STRING([--enable-lto], [Enable link-time optimization. Suitable for (optimised) product builds. Building might take @@ -10392,40 +10388,26 @@ AC_SUBST(SYSTEM_LIBEXTTEXTCAT_DATA) dnl === dnl Checking for libnumbertext dnl === -AC_MSG_CHECKING([whether to use libnumbertext]) -if test "$enable_libnumbertext" = "no"; then -AC_MSG_RESULT([no]) -ENABLE_LIBNUMBERTEXT= -SYSTEM_LIBNUMBERTEXT= +libo_CHECK_SYSTEM_MODULE([libnumbertext],[LIBNUMBERTEXT],[libnumbertext >= 1.0.0]) +if test "$with_system_libnumbertext" = "yes"; then +SYSTEM_LIBNUMBERTEXT_DATA=file://`$PKG_CONFIG --variable=pkgdatadir libnumbertext` +SYSTEM_LIBNUMBERTEXT=YES else -AC_MSG_RESULT([yes]) -ENABLE_LIBNUMBERTEXT=TRUE -libo_CHECK_SYSTEM_MODULE([libnumbertext],[LIBNUMBERTEXT],[libnumbertext >= 1.0.0]) -if test "$with_system_libnumbertext" = "yes"; then -SYSTEM_LIBNUMBERTEXT_DATA=file://`$PKG_CONFIG --variable=pkgdatadir libnumbertext` -S
[Libreoffice-commits] core.git: framework/source
framework/source/dispatch/closedispatcher.cxx |5 +
1 file changed, 1 insertion(+), 4 deletions(-)
New commits:
commit f62f200f31ac20c4e28a1e6fbead512d55bdf04f
Author: Fatih
AuthorDate: Tue May 19 04:42:18 2020 +0300
Commit: Michael Stahl
CommitDate: Thu Jun 11 16:15:39 2020 +0200
tdf#88205: Adapt uses of css::uno::Sequence to use initializer_list ctor
Change-Id: I4f87f1735fbb61125f4c3bdd0239b28c6df400de
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94471
Tested-by: Jenkins
Reviewed-by: Fatih Budak
Reviewed-by: Michael Stahl
diff --git a/framework/source/dispatch/closedispatcher.cxx
b/framework/source/dispatch/closedispatcher.cxx
index 4724857b847f..2dc4795abdc4 100644
--- a/framework/source/dispatch/closedispatcher.cxx
+++ b/framework/source/dispatch/closedispatcher.cxx
@@ -91,10 +91,7 @@ void SAL_CALL CloseDispatcher::dispatch(const css::util::URL&
css::uno::Sequence< sal_Int16 > SAL_CALL
CloseDispatcher::getSupportedCommandGroups()
{
-css::uno::Sequence< sal_Int16 > lGroups(2);
-lGroups[0] = css::frame::CommandGroup::VIEW;
-lGroups[1] = css::frame::CommandGroup::DOCUMENT;
-return lGroups;
+return css::uno::Sequence< sal_Int16 >{css::frame::CommandGroup::VIEW,
css::frame::CommandGroup::DOCUMENT};
}
css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL
CloseDispatcher::getConfigurableDispatchInformation(sal_Int16 nCommandGroup)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/nisz/libreoffice-6-4' - sw/qa sw/source
sw/qa/extras/uiwriter/data2/tdf123102.odt |binary
sw/qa/extras/uiwriter/uiwriter2.cxx | 11 +++
sw/source/core/table/swnewtable.cxx | 15 +++
3 files changed, 26 insertions(+)
New commits:
commit 6dfedeb37fe0334e78161419de058644553d955a
Author: László Németh
AuthorDate: Wed Feb 26 10:18:32 2020 +0100
Commit: Gabor Kelemen
CommitDate: Thu Jun 11 16:14:54 2020 +0200
tdf#123102 Writer: fix numbering at row insertion
in vertically merged cells. Hidden paragraph of
the new merged cell inherited numbering of the
previous row, resulting bad numbering of the next
list item.
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89537
Tested-by: Jenkins
Reviewed-by: László Németh
(cherry picked from commit 3a69e1a6b8eab79c55b6e8f3edd2ee2da45b39c0)
Change-Id: Ib6b29947caa22747ba8c79725ab6f9ef4db31319
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96137
Tested-by: Gabor Kelemen
Reviewed-by: Gabor Kelemen
diff --git a/sw/qa/extras/uiwriter/data2/tdf123102.odt
b/sw/qa/extras/uiwriter/data2/tdf123102.odt
new file mode 100644
index ..731a9b1521c1
Binary files /dev/null and b/sw/qa/extras/uiwriter/data2/tdf123102.odt differ
diff --git a/sw/qa/extras/uiwriter/uiwriter2.cxx
b/sw/qa/extras/uiwriter/uiwriter2.cxx
index 949c04514da8..009e62c08505 100644
--- a/sw/qa/extras/uiwriter/uiwriter2.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter2.cxx
@@ -19,6 +19,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -995,6 +996,16 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf105413)
getProperty(getParagraph(1),
"ParaStyleName"));
}
+CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf123102)
+{
+createDoc("tdf123102.odt");
+// insert a new row after a vertically merged cell
+lcl_dispatchCommand(mxComponent, ".uno:InsertRowsAfter", {});
+xmlDocPtr pXmlDoc = parseLayoutDump();
+// This was "3." - caused by the hidden numbered paragraph of the new
merged cell
+assertXPath(pXmlDoc, "/root/page/body/tab/row[6]/cell[1]/txt/Special",
"rText", "2.");
+}
+
CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testUnfloatButtonSmallTable)
{
// The floating table in the test document is too small, so we don't
provide an unfloat button
diff --git a/sw/source/core/table/swnewtable.cxx
b/sw/source/core/table/swnewtable.cxx
index 04a2509b1e37..cda74b4af5e9 100644
--- a/sw/source/core/table/swnewtable.cxx
+++ b/sw/source/core/table/swnewtable.cxx
@@ -1517,7 +1517,22 @@ bool SwTable::InsertRow( SwDoc* pDoc, const SwSelBoxes&
rBoxes,
if( nRowSpan == 1 || nRowSpan == -1 )
nRowSpan = n + 1;
else if( nRowSpan > 1 )
+{
nRowSpan = - nRowSpan;
+
+// tdf#123102 disable numbering of the new hidden
+// paragraph in merged cells to avoid of bad
+// renumbering of next list elements
+SwTableBox* pBox =
pNewLine->GetTabBoxes()[nCurrBox];
+SwNodeIndex aIdx( *pBox->GetSttNd(), +1 );
+SwContentNode* pCNd =
aIdx.GetNode().GetContentNode();
+if( pCNd && pCNd->IsTextNode() &&
pCNd->GetTextNode()->GetNumRule() )
+{
+SwPosition aPos( *pCNd->GetTextNode() );
+SwPaM aPam( aPos, aPos );
+pDoc->DelNumRules( aPam );
+}
+}
}
else
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/quartz
vcl/quartz/salgdicommon.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 662a0fcdac5fd5b8709cc5bf2589cbe5b9dfc077
Author: Stephan Bergmann
AuthorDate: Thu Jun 11 13:20:49 2020 +0200
Commit: Stephan Bergmann
CommitDate: Thu Jun 11 16:02:33 2020 +0200
loplugin:simplifybool (macOS)
Change-Id: Iae0a2966aa6394e16c2ba3d4155d90bac373472f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96118
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/vcl/quartz/salgdicommon.cxx b/vcl/quartz/salgdicommon.cxx
index 3126400709f2..5acc4d4e4e77 100644
--- a/vcl/quartz/salgdicommon.cxx
+++ b/vcl/quartz/salgdicommon.cxx
@@ -924,7 +924,7 @@ bool AquaSalGraphics::drawPolyLine(
const CGRect aRefreshRect = CGPathGetBoundingBox( xPath );
// #i97317# workaround for Quartz having problems with drawing small
polygons
-if( ! ((aRefreshRect.size.width <= 0.125) && (aRefreshRect.size.height <=
0.125)) )
+if( (aRefreshRect.size.width > 0.125) || (aRefreshRect.size.height >
0.125) )
{
// use the path to prepare the graphics context
maContextHolder.saveState();
@@ -987,7 +987,7 @@ bool AquaSalGraphics::drawPolyPolygon(
const CGRect aRefreshRect = CGPathGetBoundingBox( xPath );
// #i97317# workaround for Quartz having problems with drawing small
polygons
-if( ! ((aRefreshRect.size.width <= 0.125) && (aRefreshRect.size.height <=
0.125)) )
+if( (aRefreshRect.size.width > 0.125) || (aRefreshRect.size.height >
0.125) )
{
// prepare drawing mode
CGPathDrawingMode eMode;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Help- How to select a cell programatically using Java in LibreOffice calc
Hello Team, I am a novice LibreOffice Addin developer. In LibreOffice calc , I get the selected cell from XModel as xModel.getCurrentSelection(); but i couldn't see a way to set a cell as selected cell. I want to know how I can select a cell using code.( preferably Java). Please advise -- Best Regards, Harish Kumar.B ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-6-4-5' - toolkit/qa
toolkit/qa/cppunit/EventContainer.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 95c99ae24e8772de09a24925b8fd28da89f40693
Author: Samuel Mehrbrodt
AuthorDate: Mon May 11 07:48:23 2020 +0200
Commit: Stephan Bergmann
CommitDate: Thu Jun 11 15:51:23 2020 +0200
Fix 32bit linux build
Change-Id: I4faf3fb20c632163f98264d162bbf85f80b3603d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93797
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt
(cherry picked from commit fa0d576378cafab396a3fb75b1dbe1905d5df9ce)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96090
Reviewed-by: Michael Stahl
(cherry picked from commit c7bb5be1b6a9d6ea8a3fb10dba32c2fd346261a3)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96095
Reviewed-by: Stephan Bergmann
Tested-by: Stephan Bergmann
diff --git a/toolkit/qa/cppunit/EventContainer.cxx
b/toolkit/qa/cppunit/EventContainer.cxx
index 300c8e5adb74..97a125c60824 100644
--- a/toolkit/qa/cppunit/EventContainer.cxx
+++ b/toolkit/qa/cppunit/EventContainer.cxx
@@ -70,7 +70,7 @@ CPPUNIT_TEST_FIXTURE(EventContainerTest, testInsertOrder)
Sequence aEventNames(xEvents->getElementNames());
sal_Int32 nEventCount = aEventNames.getLength();
-CPPUNIT_ASSERT_EQUAL(4, nEventCount);
+CPPUNIT_ASSERT_EQUAL(static_cast(4), nEventCount);
CPPUNIT_ASSERT_EQUAL(OUString("b"), aEventNames[0]);
CPPUNIT_ASSERT_EQUAL(OUString("a"), aEventNames[1]);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/osx vcl/quartz
vcl/osx/OSXTransferable.cxx |2 +-
vcl/osx/clipboard.cxx |2 +-
vcl/quartz/salbmp.cxx |2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit b5cb211f80fd87c109633232cf340ac7969c8648
Author: Stephan Bergmann
AuthorDate: Thu Jun 11 13:20:00 2020 +0200
Commit: Stephan Bergmann
CommitDate: Thu Jun 11 15:37:21 2020 +0200
loplugin:simplifypointertobool (macOS)
Change-Id: I414eaf0e61be09ccf12d04577c89dbcdb845f85f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96117
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/vcl/osx/OSXTransferable.cxx b/vcl/osx/OSXTransferable.cxx
index 92f997f90d34..6f8613799111 100644
--- a/vcl/osx/OSXTransferable.cxx
+++ b/vcl/osx/OSXTransferable.cxx
@@ -129,7 +129,7 @@ SAL_WNODEPRECATED_DECLARATIONS_POP
dp = DataFlavorMapper::getDataProvider(sysFormat, sysData);
}
- if (dp.get() == nullptr)
+ if (!dp)
{
throw UnsupportedFlavorException("AquaClipboard: Unsupported data
flavor",
static_cast(this));
diff --git a/vcl/osx/clipboard.cxx b/vcl/osx/clipboard.cxx
index c2adb5bfcd3c..48c2a94e7bfd 100644
--- a/vcl/osx/clipboard.cxx
+++ b/vcl/osx/clipboard.cxx
@@ -293,7 +293,7 @@ void AquaClipboard::provideDataForType(NSPasteboard*
sender, const NSString* typ
DataProviderPtr_t dp = mpDataFlavorMapper->getDataProvider(type,
mXClipboardContent);
NSData* pBoardData = nullptr;
-if (dp.get() != nullptr)
+if (dp)
{
pBoardData = dp->getSystemData();
[sender setData: pBoardData forType:const_cast(type)];
diff --git a/vcl/quartz/salbmp.cxx b/vcl/quartz/salbmp.cxx
index 87861256be43..524fad183b8e 100644
--- a/vcl/quartz/salbmp.cxx
+++ b/vcl/quartz/salbmp.cxx
@@ -300,7 +300,7 @@ bool QuartzSalBitmap::AllocateUserData()
mnBytesPerRow = 0;
}
-return m_pUserBuffer.get() != nullptr;
+return bool(m_pUserBuffer);
}
namespace {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: dbaccess/source
dbaccess/source/ui/dlg/adodatalinks.cxx | 10 -- 1 file changed, 8 insertions(+), 2 deletions(-) New commits: commit ac411c83c82babb325e2bfd32f4e7009e86eac78 Author: Julien Nabet AuthorDate: Sun Jun 7 15:42:41 2020 +0200 Commit: Mike Kaganski CommitDate: Thu Jun 11 15:28:55 2020 +0200 Use o3tl::safeCoInitializeEx and counterpart (dbaccess/adodatalinks) + add calls to o3tl::safeCoUninitializeReinit in error case blocks Change-Id: I781f174a43cd1c6b827299657a667fbb34f50143 Change-Id: I9895db229814837f0c0d756bca2c52c54d3d2e9b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95690 Tested-by: Jenkins Reviewed-by: Mike Kaganski diff --git a/dbaccess/source/ui/dlg/adodatalinks.cxx b/dbaccess/source/ui/dlg/adodatalinks.cxx index fc129b2dea33..5792345ee61c 100644 --- a/dbaccess/source/ui/dlg/adodatalinks.cxx +++ b/dbaccess/source/ui/dlg/adodatalinks.cxx @@ -42,7 +42,12 @@ OUString PromptNew(long hWnd) BSTR _result=nullptr; // Initialize COM -::CoInitializeEx( nullptr, COINIT_APARTMENTTHREADED ); +hr = ::CoInitializeEx( nullptr, COINIT_APARTMENTTHREADED ); +bool bDoUninit = true; +if (FAILED(hr) && hr != RPC_E_CHANGED_MODE) +std::abort(); +if (hr == RPC_E_CHANGED_MODE) +bDoUninit = false; // Instantiate DataLinks object. hr = CoCreateInstance( @@ -83,7 +88,8 @@ OUString PromptNew(long hWnd) piTmpConnection->Release( ); dlPrompt->Release( ); -CoUninitialize(); +if (bDoUninit) +CoUninitialize(); // Don't we need SysFreeString(_result)? return o3tl::toU(_result); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: basic/qa basic/source
basic/qa/basic_coverage/test_empty_parameter.vb | 22 ++
basic/source/runtime/runtime.cxx|2 +-
2 files changed, 23 insertions(+), 1 deletion(-)
New commits:
commit 345cb192f0bc2fef97ae52ade48efc2d8591a165
Author: Andreas Heinisch
AuthorDate: Thu Jun 11 11:09:02 2020 +0200
Commit: Mike Kaganski
CommitDate: Thu Jun 11 15:26:22 2020 +0200
tdf#132563 - Convert parameters of type SbxEMPTY
During the construction of the parameter list of a method,
convert parameters of type SbxEMPTY to their requested type,
since missing parameters are handled differently in StepEMPTY,
where separate parameter information (SbxMISSING) is added.
Change-Id: Ie1e027cfdd652404ec29bd3d05e7daf533468936
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96088
Reviewed-by: Mike Kaganski
Tested-by: Jenkins
diff --git a/basic/qa/basic_coverage/test_empty_parameter.vb
b/basic/qa/basic_coverage/test_empty_parameter.vb
new file mode 100644
index ..fe6e2651c094
--- /dev/null
+++ b/basic/qa/basic_coverage/test_empty_parameter.vb
@@ -0,0 +1,22 @@
+'
+' 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/.
+'
+
+Sub assignVar(v As Variant)
+v = 1
+End Sub
+
+Function doUnitTest() As Integer
+' tdf#132563 - check if empty parameters are converted to their respective
types
+anEmptyVar = Empty
+assignVar(anEmptyVar)
+If (anEmptyVar = 1 And TypeName(anEmptyVar) = "Integer") Then
+doUnitTest = 1
+Else
+doUnitTest = 0
+End If
+End Function
diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx
index afe6c21790a1..ff5d7936247b 100644
--- a/basic/source/runtime/runtime.cxx
+++ b/basic/source/runtime/runtime.cxx
@@ -686,7 +686,7 @@ void SbiRuntime::SetParameters( SbxArray* pParams )
{
bByVal |= ( p->eType & SbxBYREF ) == 0;
// tdf#79426, tdf#125180 - don't convert missing arguments to
the requested parameter type
-if ( t != SbxEMPTY && !IsMissing( v, 1 ) )
+if ( !IsMissing( v, 1 ) )
{
t = static_cast( p->eType & 0x0FFF );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/svx include/vcl sc/source svx/source vcl/inc vcl/source
include/svx/svdograf.hxx |3 -
include/vcl/builder.hxx |4 --
include/vcl/lstbox.hxx |2 -
sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx |8 -
sc/source/ui/inc/AccessibleDocument.hxx |1
sc/source/ui/inc/AccessibleSpreadsheet.hxx |1
svx/source/svdraw/svdograf.cxx |5 ---
vcl/inc/listbox.hxx |8 -
vcl/source/control/imp_listbox.cxx | 28 ++---
vcl/source/control/listbox.cxx |5 ---
vcl/source/window/builder.cxx| 30 ---
11 files changed, 4 insertions(+), 91 deletions(-)
New commits:
commit 2126215fb3b2e77145cbf7f1d8e93ee3cca761b3
Author: Noel Grandin
AuthorDate: Thu Jun 11 12:03:08 2020 +0200
Commit: Noel Grandin
CommitDate: Thu Jun 11 15:09:59 2020 +0200
loplugin:unusedmethods
Change-Id: I1050fabdc0c98bbb0cc1d81a41c5b6ac3404cacf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96111
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/svx/svdograf.hxx b/include/svx/svdograf.hxx
index db4a3f168892..f58fd0fe3d9d 100644
--- a/include/svx/svdograf.hxx
+++ b/include/svx/svdograf.hxx
@@ -199,9 +199,6 @@ public:
bool isEmbeddedVectorGraphicData() const;
GDIMetaFile getMetafileFromEmbeddedVectorGraphicData() const;
-/// Returns the page number of the embedded data (typically to re-render
or import it).
-sal_Int32 getEmbeddedPageNumber() const;
-
virtual SdrObjectUniquePtr DoConvertToPolyObj(bool bBezier, bool bAddText)
const override;
virtual voidAdjustToMaxRect( const tools::Rectangle& rMaxRect,
bool bShrinkOnly = false ) override;
diff --git a/include/vcl/builder.hxx b/include/vcl/builder.hxx
index b2bc2488bd03..c135af4f150e 100644
--- a/include/vcl/builder.hxx
+++ b/include/vcl/builder.hxx
@@ -270,8 +270,6 @@ private:
std::vector m_aNumericFormatterAdjustmentMaps;
std::vector m_aFormattedFormatterAdjustmentMaps;
-std::vector m_aTimeFormatterAdjustmentMaps;
-std::vector m_aDateFormatterAdjustmentMaps;
std::vector m_aScrollAdjustmentMaps;
std::vector m_aSliderAdjustmentMaps;
@@ -341,8 +339,6 @@ private:
voidconnectNumericFormatterAdjustment(const OString &id, const
OUString &rAdjustment);
voidconnectFormattedFormatterAdjustment(const OString &id, const
OUString &rAdjustment);
-voidconnectTimeFormatterAdjustment(const OString &id, const
OUString &rAdjustment);
-voidconnectDateFormatterAdjustment(const OString &id, const
OUString &rAdjustment);
voidextractGroup(const OString &id, stringmap &rVec);
voidextractModel(const OString &id, stringmap &rVec);
diff --git a/include/vcl/lstbox.hxx b/include/vcl/lstbox.hxx
index d72de5b0b637..ff44aa59af14 100644
--- a/include/vcl/lstbox.hxx
+++ b/include/vcl/lstbox.hxx
@@ -225,8 +225,6 @@ public:
sal_uInt16 GetDisplayLineCount() const;
-voidEnableMirroring();
-
/** checks whether a certain point lies within the bounds of
a listbox item and returns the item as well as the character position
the point is at.
diff --git a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx
b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx
index b2c743b8234b..f9d45373618c 100644
--- a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx
+++ b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx
@@ -1652,12 +1652,4 @@ bool
ScAccessibleSpreadsheet::GetFormulaCurrentFocusCell(ScAddress &addr)
return false;
}
-uno::Reference < XAccessible > ScAccessibleSpreadsheet::GetActiveCell()
-{
-if( m_mapSelectionSend.find( maActiveCell ) != m_mapSelectionSend.end() )
-return m_mapSelectionSend[maActiveCell];
-else
-return getAccessibleCellAt(maActiveCell.Row(), maActiveCell .Col());
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/inc/AccessibleDocument.hxx
b/sc/source/ui/inc/AccessibleDocument.hxx
index 364fbcb3e7c9..975046b55be5 100644
--- a/sc/source/ui/inc/AccessibleDocument.hxx
+++ b/sc/source/ui/inc/AccessibleDocument.hxx
@@ -252,7 +252,6 @@ private:
static OUString GetCurrentCellDescription();
tools::Rectangle GetVisibleArea_Impl() const;
-css::uno::Sequence< css::uno::Any > GetScAccFlowToSequence();
public:
ScDocument *GetDocument() const ;
ScAddress GetCurCellAddress() const;
diff --git a/sc/source/ui/inc/AccessibleSpreadsheet.hxx
b/sc/source/ui/inc/AccessibleSpreadsheet.hxx
index f2ecf98429de..4ef24c81f61b 100644
--- a/sc/source/ui/inc/AccessibleSpreadsheet.hxx
+++ b/sc/source/ui/inc/AccessibleSpreadsheet.hxx
@@ -77,7 +77,6 @@ public:
void VisAreaChanged();
void FireFirstCellFocus
[Libreoffice-commits] core.git: Branch 'distro/nisz/libreoffice-6-4' - vcl/source
vcl/source/window/printdlg.cxx |4 1 file changed, 4 deletions(-) New commits: commit acc1bdbcb1de0a12cb33b378da0bd09f559fa8b4 Author: Kelemen Gábor AuthorDate: Wed Feb 12 13:36:08 2020 +0100 Commit: Gabor Kelemen CommitDate: Thu Jun 11 14:44:46 2020 +0200 tdf#127167 Do not reset Draw/Impress page size to default A4 when modifying the Size settings in Print dialog - LO Draw/Impress page Change-Id: I28321d29408964d97b2b347c0b9f16cb1fb63183 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88530 Tested-by: Jenkins Reviewed-by: Katarina Behrens (cherry picked from commit 974dc965f2ef581600228ed438d80a3c914ddaf5) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96132 Tested-by: Gabor Kelemen Reviewed-by: Gabor Kelemen diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx index d96ad8f3997e..5ad23201d2d1 100644 --- a/vcl/source/window/printdlg.cxx +++ b/vcl/source/window/printdlg.cxx @@ -2050,10 +2050,6 @@ IMPL_LINK( PrintDialog, UIOption_RadioHdl, weld::ToggleButton&, i_rBtn, void ) sal_Int32 nVal = it->second; pVal->Value <<= nVal; -// tdf#63905 use paper size set in printer properties -if (pVal->Name == "PageOptions") -maPController->resetPaperToLastConfigured(); - updateOrientationBox(); checkOptionalControlDependencies(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/nisz/libreoffice-6-4' - vcl/source
vcl/source/gdi/print3.cxx | 21 +
vcl/source/window/printdlg.cxx |4 ++--
2 files changed, 23 insertions(+), 2 deletions(-)
New commits:
commit e70069d370bedcb09b515842e4c80f58b27f4454
Author: Kelemen Gábor
AuthorDate: Fri Feb 7 12:39:12 2020 +0100
Commit: Gabor Kelemen
CommitDate: Thu Jun 11 14:21:56 2020 +0200
tdf#126744 Transfer paper size and orientation to new printer
when selected from the Printer dropdown list
Change-Id: Iedd53575c2e9146b663cf21b42b495473abe5165
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88373
Tested-by: Jenkins
Reviewed-by: Katarina Behrens
(cherry picked from commit 5c283b86cd1f57d82b8d2c4d2fa355b50bd39e3b)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96130
Tested-by: Gabor Kelemen
Reviewed-by: Gabor Kelemen
diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx
index 50b20930cf19..29a084011ce3 100644
--- a/vcl/source/gdi/print3.cxx
+++ b/vcl/source/gdi/print3.cxx
@@ -780,6 +780,20 @@ weld::Window* PrinterController::getWindow() const
void PrinterController::setPrinter( const VclPtr& i_rPrinter )
{
+VclPtr xPrinter = mpImplData->mxPrinter;
+
+Size aPaperSize; // Save current paper size
+Orientation eOrientation = Orientation::Portrait; // Save current paper
orientation
+bool bSavedSizeOrientation = false;
+
+// #tdf 126744 Transfer paper size and orientation settings to newly
selected printer
+if ( xPrinter.get() )
+{
+aPaperSize = xPrinter->GetPaperSize();
+eOrientation = xPrinter->GetOrientation();
+bSavedSizeOrientation = true;
+}
+
mpImplData->mxPrinter = i_rPrinter;
setValue( "Name",
css::uno::makeAny( i_rPrinter->GetName() ) );
@@ -787,6 +801,13 @@ void PrinterController::setPrinter( const VclPtr&
i_rPrinter )
mpImplData->mxPrinter->Push();
mpImplData->mxPrinter->SetMapMode(MapMode(MapUnit::Map100thMM));
mpImplData->maDefaultPageSize = mpImplData->mxPrinter->GetPaperSize();
+
+if ( bSavedSizeOrientation )
+{
+ mpImplData->mxPrinter->SetPaperSizeUser(aPaperSize,
!mpImplData->isFixedPageSize());
+ mpImplData->mxPrinter->SetOrientation(eOrientation);
+}
+
mpImplData->mbPapersizeFromUser = false;
mpImplData->mxPrinter->Pop();
mpImplData->mnFixedPaperBin = -1;
diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index 7d340559806a..d96ad8f3997e 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -1909,7 +1909,7 @@ IMPL_LINK( PrintDialog, SelectHdl, weld::ComboBox&, rBox,
void )
mxOKButton->set_label(maPrintText);
updatePrinterText();
setPaperSizes();
-preparePreview(false);
+preparePreview(true);
}
else // print to file
{
@@ -1964,7 +1964,7 @@ IMPL_LINK( PrintDialog, SelectHdl, weld::ComboBox&, rBox,
void )
checkPaperSize( aPaperSize );
maPController->setPaperSizeFromUser( aPaperSize );
-preparePreview(false);
+preparePreview(true);
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/nisz/libreoffice-6-4' - i18npool/source
i18npool/source/localedata/data/hu_HU.xml |5 + 1 file changed, 5 insertions(+) New commits: commit e8db5876f22e1f83a4b833523730860dbbeb2d44 Author: Kelemen Gábor AuthorDate: Wed Dec 18 14:18:16 2019 +0100 Commit: Gabor Kelemen CommitDate: Thu Jun 11 14:12:44 2020 +0200 tdf#129240 More date acceptance patterns for Hungarian language Now cell values matching these patterns are accepted as date: 2019-12-24 2019.12.24 2019.12.24. 2019. 12. 24. 12-24 12.24 12.24. 12. 24. Change-Id: Ida08deb054fd29aef5d941626c8225732e447662 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/85385 Tested-by: Jenkins Reviewed-by: László Németh (cherry picked from commit 16d4d1b8ecd99c68c6e11907f9562803ebe7cd9c) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96109 Tested-by: Gabor Kelemen Reviewed-by: Gabor Kelemen diff --git a/i18npool/source/localedata/data/hu_HU.xml b/i18npool/source/localedata/data/hu_HU.xml index 269f1fddf0bc..e494c6404566 100644 --- a/i18npool/source/localedata/data/hu_HU.xml +++ b/i18npool/source/localedata/data/hu_HU.xml @@ -54,6 +54,11 @@ M-D M.D +M.D. +M. D. +Y-M-D +Y.M.D. +Y. M. D. Standard ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/nisz/libreoffice-6-4' - sw/qa sw/source
sw/qa/extras/ooxmlexport/data/tdf88496.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport11.cxx | 10 ++
sw/source/core/layout/tabfrm.cxx|7 ---
3 files changed, 14 insertions(+), 3 deletions(-)
New commits:
commit 814da1724b61a106ab82e8dd1836e3b2f628cf4e
Author: László Németh
AuthorDate: Thu Jan 16 21:14:45 2020 +0100
Commit: Gabor Kelemen
CommitDate: Thu Jun 11 14:01:24 2020 +0200
tdf#88496 DOCX: disable long repeating table header
if the pages could contain only that, hiding the
non-repeating table rows. This behavior is similar
to MSO.
See also commit 110781a3a27dffe9e6690839bdce993796a08331
(tdf#58944 DOCX import: workaround for hidden table headers).
Change-Id: I646be45c6d2c5fe9e1df0badeee4583097dc79f1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86928
Reviewed-by: László Németh
Tested-by: László Németh
(cherry picked from commit f7e071a00542c414a7e9d7bcf4434d908f225e59)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96106
Tested-by: Gabor Kelemen
Reviewed-by: Gabor Kelemen
diff --git a/sw/qa/extras/ooxmlexport/data/tdf88496.docx
b/sw/qa/extras/ooxmlexport/data/tdf88496.docx
new file mode 100644
index ..b34f30389e2f
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf88496.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
index 9e99abb06848..cf2766ac2b45 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
@@ -1123,6 +1123,16 @@ DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf81100,
"tdf81100.docx")
assertXPath(pDump, "/root/page[3]/body/tab/row", 1);
}
+DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf88496, "tdf88496.docx")
+{
+xmlDocPtr pXmlDoc = parseExport("word/styles.xml");
+CPPUNIT_ASSERT(pXmlDoc);
+// Switch off repeating header, there is no place for it.
+// Now there are only 3 pages with complete table content
+// instead of a 51-page long table only with header.
+CPPUNIT_ASSERT_EQUAL(3, getPages());
+}
+
DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf121597TrackedDeletionOfMultipleParagraphs,
"tdf121597.odt")
{
xmlDocPtr pXmlDoc = parseExport("word/document.xml");
diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index 42150626aa10..a75a250c7fc9 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -1074,10 +1074,11 @@ bool SwTabFrame::Split( const SwTwips nCutPos, bool
bTryToSplit, bool bTableRowK
if ( nRowCount < nRepeat )
{
// First case: One of the repeated headline does not fit to the page
anymore.
-// At least one more non-heading row has to stay in this table in
-// order to avoid loops:
+// tdf#88496 Disable repeated headline (like for #i44910#) to avoid
loops and
+// to fix interoperability problems (very long tables only with
headline)
OSL_ENSURE( !GetIndPrev(), "Table is supposed to be at beginning" );
-bKeepNextRow = true;
+m_pTable->SetRowsToRepeat(0);
+return false;
}
else if ( !GetIndPrev() && nRepeat == nRowCount )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: writerperfect/CppunitTest_writerperfect_dialogs_test.mk writerperfect/Module_writerperfect.mk writerperfect/qa
writerperfect/CppunitTest_writerperfect_dialogs_test.mk | 68 ++ writerperfect/Module_writerperfect.mk |4 writerperfect/qa/unit/data/writerperfect-dialogs-test.txt | 38 +++ writerperfect/qa/unit/writerperfect-dialogs-test.cxx | 58 +++ 4 files changed, 168 insertions(+) New commits: commit 430a89fa4876a1ba4057f47c87d7882f11dc66b3 Author: Olivier Hallot AuthorDate: Wed May 27 18:22:35 2020 -0300 Commit: Olivier Hallot CommitDate: Thu Jun 11 13:59:54 2020 +0200 tdf#119114 Add writerperfect / epub screenshot Create writerperfect screenshot Change-Id: I59d33d7e60cbe7326f3ebd8fbe57e1a4545c31c9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95008 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/writerperfect/CppunitTest_writerperfect_dialogs_test.mk b/writerperfect/CppunitTest_writerperfect_dialogs_test.mk new file mode 100644 index ..1052d7700305 --- /dev/null +++ b/writerperfect/CppunitTest_writerperfect_dialogs_test.mk @@ -0,0 +1,68 @@ +# -*- 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_CppunitTest_CppunitScreenShot,writerperfect_dialogs_test)) + +$(eval $(call gb_CppunitTest_add_exception_objects,writerperfect_dialogs_test, \ +writerperfect/qa/unit/writerperfect-dialogs-test \ +)) + +$(eval $(call gb_CppunitTest_use_sdk_api,writerperfect_dialogs_test)) + +$(eval $(call gb_CppunitTest_set_include,desktop_dialogs_test,\ +-I$(SRCDIR)/writerperfect/inc \ +$$(INCLUDE) \ +)) + +$(eval $(call gb_CppunitTest_use_libraries,writerperfect_dialogs_test, \ +basegfx \ +comphelper \ +cppu \ +cppuhelper \ +drawinglayer \ +editeng \ +i18nlangtag \ +i18nutil \ +msfilter \ +oox \ +sal \ +salhelper \ +sax \ +sfx \ +sot \ +svl \ +svt \ +test \ +tl \ +tk \ +ucbhelper \ +unotest \ +utl \ +vcl \ +xo \ +)) + +$(eval $(call gb_CppunitTest_use_external,writerperfect_dialogs_test,boost_headers)) + +$(eval $(call gb_CppunitTest_use_sdk_api,writerperfect_dialogs_test)) + +$(eval $(call gb_CppunitTest_use_ure,writerperfect_dialogs_test)) +$(eval $(call gb_CppunitTest_use_vcl_non_headless_with_windows,writerperfect_dialogs_test)) + +$(eval $(call gb_CppunitTest_use_rdb,writerperfect_dialogs_test,services)) + +$(eval $(call gb_CppunitTest_use_configuration,writerperfect_dialogs_test)) + +$(eval $(call gb_CppunitTest_use_uiconfigs,writerperfect_dialogs_test,\ + writerperfect \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/writerperfect/Module_writerperfect.mk b/writerperfect/Module_writerperfect.mk index 01f8a0dc5e59..c24b0dd5bcc6 100644 --- a/writerperfect/Module_writerperfect.mk +++ b/writerperfect/Module_writerperfect.mk @@ -51,4 +51,8 @@ $(eval $(call gb_Module_add_uicheck_targets,writerperfect,\ UITest_writerperfect_epubexport \ )) +# screenshots +$(eval $(call gb_Module_add_screenshot_targets,writerperfect,\ +CppunitTest_writerperfect_dialogs_test \ +)) # vim: set noet sw=4 ts=4: diff --git a/writerperfect/qa/unit/data/writerperfect-dialogs-test.txt b/writerperfect/qa/unit/data/writerperfect-dialogs-test.txt new file mode 100644 index ..3a0cdf5cbb88 --- /dev/null +++ b/writerperfect/qa/unit/data/writerperfect-dialogs-test.txt @@ -0,0 +1,38 @@ +# -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +# This file contains all dialogs that the unit tests in the module +# will work on if it is in script mode. It will read one-by-one, +# try to open it and create a screenshot that will be saved in +# workdir/screenshots using the pattern of the ui-file name. +# +# Syntax: +# - empty lines are allowed +# - lines starting with '#' are treated as comment +# - all other lines should contain a *.ui filename in the same +# notation as in the dialog constructors (see code) + +# +# The 'known' dialogs which have a hard-coded representation +# in registerKnownDialogsByID/createDialogByID +# + +# No known dialogs in writerperfect for now + +# +# Dialogs without a hard-coded representation. These will +# be visualized using a fallback based on VclBuilder +# + +# currently deactivated, leads to problems and the test to not work +# This is typically
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 2695951b7bc178fdbcdce174762343bc4b691a33 Author: Alain🐍Romedenne AuthorDate: Thu Jun 11 13:58:55 2020 +0200 Commit: Gerrit Code Review CommitDate: Thu Jun 11 13:58:55 2020 +0200 Update git submodules * Update helpcontent2 from branch 'master' to 7c39ebe635e48c0362375c731724d6f8bd15971a - Typo in Basic script Change-Id: I73108c42e82a1e11606e373f1fce0f6a94198f7e Reviewed-on: https://gerrit.libreoffice.org/c/help/+/96094 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 7c42a667bf18..7c39ebe635e4 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 7c42a667bf18ea2ce2f88e11978a13b3860c7689 +Subproject commit 7c39ebe635e48c0362375c731724d6f8bd15971a ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/sbasic/python/python_2_basic.xhp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 7c39ebe635e48c0362375c731724d6f8bd15971a Author: Alain🐍Romedenne AuthorDate: Thu Jun 11 10:21:20 2020 +0200 Commit: Olivier Hallot CommitDate: Thu Jun 11 13:58:55 2020 +0200 Typo in Basic script Change-Id: I73108c42e82a1e11606e373f1fce0f6a94198f7e Reviewed-on: https://gerrit.libreoffice.org/c/help/+/96094 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/sbasic/python/python_2_basic.xhp b/source/text/sbasic/python/python_2_basic.xhp index 60d31312a..b9978122c 100644 --- a/source/text/sbasic/python/python_2_basic.xhp +++ b/source/text/sbasic/python/python_2_basic.xhp @@ -129,7 +129,7 @@ Next i End If Print str - End Sub ' Standard.Scripting.Print() + End Sub ' Standard.Scripting.Print() Public Function SUM(ParamArray args() As Variant) As Variant ''' SUM a variable list of numbers ''' ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - sw/qa
sw/qa/uitest/writer_tests6/tdf125104.py | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
New commits:
commit e99caca4301fc829ae31b02a51202ad046ee9a37
Author: Tor Lillqvist
AuthorDate: Thu Jun 11 13:46:08 2020 +0300
Commit: Tor Lillqvist
CommitDate: Thu Jun 11 13:52:52 2020 +0200
Revert "Comment out a few page numbering tests that don't work in this
branch"
The issue was caused by the --disable-libnumbertext that I was using
for no good reason.
This reverts commit 9408b42881f0b645151f96048f86f90924a58a67.
Change-Id: I95a685d9aa6c75135aa5abda82e1f79e4c1cb56f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96114
Tested-by: Tor Lillqvist
Reviewed-by: Tor Lillqvist
diff --git a/sw/qa/uitest/writer_tests6/tdf125104.py
b/sw/qa/uitest/writer_tests6/tdf125104.py
index e0693ba08c6e..cf38208c0fd8 100644
--- a/sw/qa/uitest/writer_tests6/tdf125104.py
+++ b/sw/qa/uitest/writer_tests6/tdf125104.py
@@ -36,14 +36,14 @@ class tdf125104(UITestCase):
self.assertEqual(document.Text.String[0:1], "1")
self.assertEqual(document.Text.String[2:3], "2")
-## Bug 125104 - Changing page numbering to "1st, 2nd, 3rd,..." causes
crashes when trying to change Page settings later
-#self.set_combo_layout_format(self.open_page_style_dialog(), "1st,
2nd, 3rd, ...")
-#self.assertEqual(document.Text.String[0:3], "1st")
-#self.assertEqual(document.Text.String[4:7], "2nd")
+# Bug 125104 - Changing page numbering to "1st, 2nd, 3rd,..." causes
crashes when trying to change Page settings later
+self.set_combo_layout_format(self.open_page_style_dialog(), "1st, 2nd,
3rd, ...")
+self.assertEqual(document.Text.String[0:3], "1st")
+self.assertEqual(document.Text.String[4:7], "2nd")
xDialog = self.open_page_style_dialog()
-#comboLayoutFormat = xDialog.getChild("comboLayoutFormat")
-
#self.assertEqual(get_state_as_dict(comboLayoutFormat)["SelectEntryText"],
"1st, 2nd, 3rd, ...")
+comboLayoutFormat = xDialog.getChild("comboLayoutFormat")
+
self.assertEqual(get_state_as_dict(comboLayoutFormat)["SelectEntryText"], "1st,
2nd, 3rd, ...")
cancelBtn = xDialog.getChild("cancel")
self.ui_test.close_dialog_through_button(cancelBtn)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/nisz/libreoffice-6-4' - sw/qa writerfilter/source
sw/qa/extras/ooxmlexport/data/tdf94801.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport11.cxx |7 +++
sw/qa/extras/ooxmlexport/ooxmlexport14.cxx |5 +
sw/qa/extras/ooxmlexport/ooxmlexport8.cxx|6 +++---
sw/qa/extras/rtfimport/rtfimport.cxx |2 +-
writerfilter/source/dmapper/ConversionHelper.cxx |9 +
writerfilter/source/dmapper/ConversionHelper.hxx |1 +
writerfilter/source/dmapper/DomainMapperTableManager.cxx |8 ++--
8 files changed, 32 insertions(+), 6 deletions(-)
New commits:
commit 837879013c855b366106cf5806b81104186bd9d3
Author: László Németh
AuthorDate: Tue Jan 14 12:56:54 2020 +0100
Commit: Gabor Kelemen
CommitDate: Thu Jun 11 13:52:34 2020 +0200
tdf#94801 DOCX import: fix table width loss by rounding
up the converted sum of table grid values. Small table
width loss (< 1/100 mm) could result big layout differences,
based on different line breaking etc.
When table width is calculated by sum of table grid widths,
now there is only a single conversion to 1/100 mm at the end,
with rounding up the width instead of rounding down.
Preventing regressions, both grid and cell width values are
stored in the original twip now, instead of converting them to
1/100 mm one by one.
Change-Id: I6f0755b6604f4976b8ecb25255c76fe6afd5e35b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86718
Reviewed-by: László Németh
Tested-by: László Németh
(cherry picked from commit 62d084d50c0e6c90918f687251ffbb15264d7317)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96105
Tested-by: Gabor Kelemen
Reviewed-by: Gabor Kelemen
diff --git a/sw/qa/extras/ooxmlexport/data/tdf94801.docx
b/sw/qa/extras/ooxmlexport/data/tdf94801.docx
new file mode 100644
index ..bdbd3f5e5400
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf94801.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
index 7ec5da49be9f..9e99abb06848 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
@@ -327,6 +327,13 @@ DECLARE_OOXMLEXPORT_TEST(testTdf117988, "tdf117988.docx")
CPPUNIT_ASSERT_EQUAL(1, getPages());
}
+DECLARE_OOXMLEXPORT_TEST(testTdf94801, "tdf94801.docx")
+{
+// This was a 2-page document with unwanted line breaking in table cells,
because
+// the table was narrower, than defined (< 1/100 mm loss during twip to
1/100 mm conversion)
+CPPUNIT_ASSERT_EQUAL(1, getPages());
+}
+
DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testParagraphSplitOnSectionBorder,
"parasplit-on-section-border.odt")
{
xmlDocPtr pXmlDoc = parseExport("word/document.xml");
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
index 375c6d874021..09a179eb2bb0 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
@@ -251,6 +251,11 @@ DECLARE_OOXMLEXPORT_TEST(testTdf124367, "tdf124367.docx")
uno::UNO_QUERY);
uno::Reference xTextTable(xTables->getByIndex(0),
uno::UNO_QUERY);
uno::Reference xTableRows = xTextTable->getRows();
+
+// import is still good, FIXME the export
+if (mbExported)
+ return;
+
// it was 2761 at the first import, and 2760 at the second import, due to
incorrect rounding
CPPUNIT_ASSERT_EQUAL(static_cast(2762),
getProperty>(
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx
index 88f8610cc0e5..b60a20cbd2eb 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx
@@ -890,7 +890,7 @@ DECLARE_OOXMLEXPORT_TEST(testFdo59273, "fdo59273.docx")
uno::Reference
xTables(xTablesSupplier->getTextTables( ), uno::UNO_QUERY);
uno::Reference xTextTable(xTables->getByIndex(0),
uno::UNO_QUERY);
// Was 115596 (i.e. 10 times wider than necessary), as w:tblW was missing
and the importer didn't set it.
-CPPUNIT_ASSERT_EQUAL(sal_Int32(12961), getProperty(xTextTable,
"Width"));
+CPPUNIT_ASSERT_EQUAL(sal_Int32(12963), getProperty(xTextTable,
"Width"));
uno::Reference xTableRows = xTextTable->getRows();
// Was 9997, so the 4th column had ~zero width
@@ -1022,7 +1022,7 @@ DECLARE_OOXMLEXPORT_TEST(testTableAutoColumnFixedSize2,
"table-auto-column-fixed
uno::Reference
xTables(xTablesSupplier->getTextTables(), uno::UNO_QUERY);
uno::Reference xTextTable(xTables->getByIndex(0),
uno::UNO_QUERY);
// This was 17907, i.e. the sum of the width of the 3 cells (10152 twips
each), which is too wide.
-CPPUNIT_ASSERT_EQUAL(sal_Int32(16891), getProperty(xTextTable,
"Width"));
+CPPUNIT_ASSERT_EQUAL(sal_Int32(16893), getProperty(xT
[Libreoffice-commits] core.git: Branch 'distro/nisz/libreoffice-6-4' - sw/qa writerfilter/source
sw/qa/extras/uiwriter/data2/tdf90069.docx |binary
sw/qa/extras/uiwriter/uiwriter2.cxx | 31 ++
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 13 +
3 files changed, 44 insertions(+)
New commits:
commit 725de1dadf1eb35771278e2f671eb36056153454
Author: László Németh
AuthorDate: Wed Jan 8 14:26:40 2020 +0100
Commit: Gabor Kelemen
CommitDate: Thu Jun 11 13:46:47 2020 +0200
tdf#90069 DOCX: fix character style of new table rows
DOCX table import didn't set paragraph level
character styles on paragraph level, only on
text portions, resulting default character style
in the newly inserted table rows instead of copying
the style of the previous table row.
Change-Id: Idb4438c767bdc7e0026fc6e0f0a795d8efdda3c8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86429
Tested-by: Jenkins
Reviewed-by: László Németh
Tested-by: László Németh
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96086
Tested-by: Gabor Kelemen
Reviewed-by: Gabor Kelemen
diff --git a/sw/qa/extras/uiwriter/data2/tdf90069.docx
b/sw/qa/extras/uiwriter/data2/tdf90069.docx
new file mode 100644
index ..719502a67e78
Binary files /dev/null and b/sw/qa/extras/uiwriter/data2/tdf90069.docx differ
diff --git a/sw/qa/extras/uiwriter/uiwriter2.cxx
b/sw/qa/extras/uiwriter/uiwriter2.cxx
index 6472929fc5ab..949c04514da8 100644
--- a/sw/qa/extras/uiwriter/uiwriter2.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter2.cxx
@@ -49,6 +49,7 @@
#include
#include
#include
+#include
namespace
{
@@ -2469,4 +2470,34 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf129655)
xmlDocPtr pXmlDoc = parseLayoutDump();
assertXPath(pXmlDoc, "//fly/txt[@WritingMode='Vertical']", 1);
}
+
+CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf90069)
+{
+SwDoc* pDoc = createDoc("tdf90069.docx");
+
+SwXTextDocument* pTextDoc =
dynamic_cast(mxComponent.get());
+CPPUNIT_ASSERT(pTextDoc);
+
+SwDocShell* pDocShell = pTextDoc->GetDocShell();
+CPPUNIT_ASSERT(pDocShell);
+
+SwWrtShell* pWrtShell = pDocShell->GetWrtShell();
+CPPUNIT_ASSERT(pWrtShell);
+
+sal_uLong nIndex = pWrtShell->GetCursor()->GetNode().GetIndex();
+
+lcl_dispatchCommand(mxComponent, ".uno:InsertRowsAfter", {});
+pWrtShell->Down(false);
+pWrtShell->Insert("foo");
+
+SwTextNode* pTextNodeA1 =
static_cast(pDoc->GetNodes()[nIndex]);
+CPPUNIT_ASSERT(pTextNodeA1->GetText().startsWith("Insert"));
+nIndex = pWrtShell->GetCursor()->GetNode().GetIndex();
+SwTextNode* pTextNodeA2 =
static_cast(pDoc->GetNodes()[nIndex]);
+CPPUNIT_ASSERT_EQUAL(OUString("foo"), pTextNodeA2->GetText());
+CPPUNIT_ASSERT_EQUAL(true,
pTextNodeA2->GetSwAttrSet().HasItem(RES_CHRATR_FONT));
+OUString sFontName =
pTextNodeA2->GetSwAttrSet().GetItem(RES_CHRATR_FONT)->GetFamilyName();
+CPPUNIT_ASSERT_EQUAL(OUString("Lohit Devanagari"), sFontName);
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index a04af3c1c8aa..666bd9b46ffb 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -1785,6 +1785,19 @@ void DomainMapper_Impl::finishParagraph( const
PropertyMapPtr& pPropertyMap, con
}
}
}
+
+// tdf#90069 in tables, apply paragraph level character style
also on
+// paragraph level to support its copy during insertion of new
table rows
+if ( xParaProps && m_nTableDepth > 0 )
+{
+uno::Sequence< beans::PropertyValue > aValues =
pParaContext->GetPropertyValues(false);
+
+for( const auto& rProp : std::as_const(aValues) )
+{
+if ( rProp.Name.startsWith("Char") && rProp.Name !=
"CharStyleName" && rProp.Name != "CharInteropGrabBag" )
+xParaProps->setPropertyValue( rProp.Name,
rProp.Value );
+}
+}
}
if( !bKeepLastParagraphProperties )
rAppendContext.pLastParagraphProperties = pToBeSavedProperties;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - sw/source
sw/source/core/doc/DocumentContentOperationsManager.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 09fea8f2752845f57f6db6e6cd221afa53eb62eb Author: Michael Stahl AuthorDate: Wed Jun 10 18:51:37 2020 +0200 Commit: Michael Stahl CommitDate: Thu Jun 11 13:23:01 2020 +0200 tdf#132254 sw: fix block selection copy reversed order The problem is that SwEditShell::CopySelToDoc() relies on the passed target SwPosition being after the target range by CopyRange(), but due to an erroneous update of aInsPos in CopyImplImpl() it was at the beginning of the target range. (regression from 28b77c89dfcafae82cf2a6d85731b643ff9290e5) Change-Id: Ie0846bd44f9349517878efcca996440bede05611 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96063 Tested-by: Jenkins Reviewed-by: Michael Stahl (cherry picked from commit 63a43218c369a43624e6bdbe880b7caa40a3b61a) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96091 diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx b/sw/source/core/doc/DocumentContentOperationsManager.cxx index a174dccbbee1..4151f9d6b562 100644 --- a/sw/source/core/doc/DocumentContentOperationsManager.cxx +++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx @@ -4833,10 +4833,10 @@ bool DocumentContentOperationsManager::CopyImplImpl(SwPaM& rPam, SwPosition& rPo } // copy at-char flys in rPam -aInsPos = *pDestTextNd; // update to new (start) node for flys +SwNodeIndex temp(*pDestTextNd); // update to new (start) node for flys // tdf#126626 prevent duplicate Undos ::sw::UndoGuard const ug(pDoc->GetIDocumentUndoRedo()); -CopyFlyInFlyImpl(aRg, &rPam, aInsPos, false); +CopyFlyInFlyImpl(aRg, &rPam, temp, false); break; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/docnode/ndtbl.cxx |4 ++--
sw/source/core/undo/untbl.cxx|4 +++-
2 files changed, 5 insertions(+), 3 deletions(-)
New commits:
commit f30e4981248f1ebc37728f5848773f730f14ea56
Author: Michael Stahl
AuthorDate: Wed Jun 10 17:30:58 2020 +0200
Commit: Michael Stahl
CommitDate: Thu Jun 11 13:22:11 2020 +0200
sw: follow-up: fix other calls of ContentIdxStore::Save(Len())
Presumably these have the same bug as sw_JoinText().
Change-Id: I77a794be92f36cf2163f819d3941d70e69eb2f27
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96057
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index 3e36cfcabc81..2cde2f38f190 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -1065,7 +1065,7 @@ SwTableNode* SwNodes::TextToTable( const SwNodeRange&
rRange, sal_Unicode cCh,
SwPosition aCntPos( aSttIdx, SwIndex( pTextNd ));
const std::shared_ptr< sw::mark::ContentIdxStore>
pContentStore(sw::mark::ContentIdxStore::Create());
-pContentStore->Save( pDoc, aSttIdx.GetIndex(),
pTextNd->GetText().getLength() );
+pContentStore->Save(pDoc, aSttIdx.GetIndex(), SAL_MAX_INT32);
if( T2T_PARA != cCh )
{
@@ -1564,7 +1564,7 @@ static void lcl_DelBox( SwTableBox* pBox, DelTabPara*
pDelPara )
const std::shared_ptr
pContentStore(sw::mark::ContentIdxStore::Create());
const sal_Int32 nOldTextLen = aCntIdx.GetIndex();
-pContentStore->Save( pDoc, nNdIdx,
pCurTextNd->GetText().getLength() );
+pContentStore->Save(pDoc, nNdIdx, SAL_MAX_INT32);
pDelPara->pLastNd->JoinNext();
diff --git a/sw/source/core/undo/untbl.cxx b/sw/source/core/undo/untbl.cxx
index 1cbf5c1bdad3..8cbf571b39e9 100644
--- a/sw/source/core/undo/untbl.cxx
+++ b/sw/source/core/undo/untbl.cxx
@@ -576,7 +576,9 @@ SwTableNode* SwNodes::UndoTableToText( sal_uLong nSttNd,
sal_uLong nEndNd,
{
pContentStore->Clear();
if( pTextNd )
-pContentStore->Save( GetDoc(), aSttIdx.GetIndex(),
pTextNd->GetText().getLength() );
+{
+pContentStore->Save(GetDoc(), aSttIdx.GetIndex(),
SAL_MAX_INT32);
+}
}
if( pTextNd )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - icon-themes/colibre icon-themes/colibre_svg
icon-themes/colibre/cmd/32/colorscaleformatdialog.png|binary icon-themes/colibre/cmd/32/conddateformatdialog.png |binary icon-themes/colibre/cmd/32/conditionalformatdialog.png |binary icon-themes/colibre/cmd/32/databarformatdialog.png |binary icon-themes/colibre/cmd/32/drawchart.png |binary icon-themes/colibre/cmd/32/iconsetformatdialog.png |binary icon-themes/colibre/cmd/lc_colorscaleformatdialog.png|binary icon-themes/colibre/cmd/lc_conddateformatdialog.png |binary icon-themes/colibre/cmd/lc_conditionalformatdialog.png |binary icon-themes/colibre/cmd/lc_databarformatdialog.png |binary icon-themes/colibre/cmd/lc_iconsetformatdialog.png |binary icon-themes/colibre/cmd/sc_colorscaleformatdialog.png|binary icon-themes/colibre/cmd/sc_conditionalformatdialog.png |binary icon-themes/colibre/cmd/sc_databarformatdialog.png |binary icon-themes/colibre/cmd/sc_iconsetformatdialog.png |binary icon-themes/colibre/links.txt|6 +++--- icon-themes/colibre/res/hldocntp.png |binary icon-themes/colibre/res/hldoctp.png |binary icon-themes/colibre/sd/res/placeholder_chart_large.png |binary icon-themes/colibre/sd/res/placeholder_chart_large_hover.png |binary icon-themes/colibre/sd/res/placeholder_chart_small.png |binary icon-themes/colibre/sd/res/placeholder_chart_small_hover.png |binary icon-themes/colibre/sd/res/placeholder_image_large.png |binary icon-themes/colibre/sd/res/placeholder_image_large_hover.png |binary icon-themes/colibre/sd/res/placeholder_image_small.png |binary icon-themes/colibre/sd/res/placeholder_image_small_hover.png |binary icon-themes/colibre/sd/res/placeholder_movie_large.png |binary icon-themes/colibre/sd/res/placeholder_movie_large_hover.png |binary icon-themes/colibre/sd/res/placeholder_movie_small.png |binary icon-themes/colibre/sd/res/placeholder_movie_small_hover.png |binary icon-themes/colibre/sd/res/placeholder_table_large.png |binary icon-themes/colibre/sd/res/placeholder_table_large_hover.png |binary icon-themes/colibre/sd/res/placeholder_table_small.png |binary icon-themes/colibre/sd/res/placeholder_table_small_hover.png |binary icon-themes/colibre_svg/cmd/32/colorscaleformatdialog.svg|2 +- icon-themes/colibre_svg/cmd/32/conddateformatdialog.svg |1 + icon-themes/colibre_svg/cmd/32/conditionalformatdialog.svg |2 +- icon-themes/colibre_svg/cmd/32/databarformatdialog.svg |2 +- icon-themes/colibre_svg/cmd/32/drawchart.svg |2 +- icon-themes/colibre_svg/cmd/32/iconsetformatdialog.svg |2 +- icon-themes/colibre_svg/cmd/lc_colorscaleformatdialog.svg|2 +- icon-themes/colibre_svg/cmd/lc_conddateformatdialog.svg |1 + icon-themes/colibre_svg/cmd/lc_conditionalformatdialog.svg |2 +- icon-themes/colibre_svg/cmd/lc_databarformatdialog.svg |2 +- icon-themes/colibre_svg/cmd/lc_iconsetformatdialog.svg |2 +- icon-themes/colibre_svg/cmd/sc_colorscaleformatdialog.svg|2 +- icon-themes/colibre_svg/cmd/sc_conditionalformatdialog.svg |2 +- icon-themes/colibre_svg/cmd/sc_databarformatdialog.svg |2 +- icon-themes/colibre_svg/cmd/sc_iconsetformatdialog.svg |2 +- icon-themes/colibre_svg/res/hldocntp.svg |2 +- icon-themes/colibre_svg/res/hldoctp.svg |2 +- icon-themes/colibre_svg/sd/res/placeholder_chart_large.svg |2 +- icon-themes/colibre_svg/sd/res/placeholder_chart_large_hover.svg |2 +- icon-themes/colibre_svg/sd/res/placeholder_chart_small.svg |3 ++- icon-themes/colibre_svg/sd/res/placeholder_chart_small_hover.svg |3 ++- icon-themes/colibre_svg/sd/res/placeholder_image_large.svg |2 +- icon-themes/colibre_svg/sd/res/placeholder_image_large_hover.svg |2 +- icon-themes/colibre_svg/sd/res/placeholder_image_small.svg |2 +- icon-themes/colibre_svg/sd/res/placeholder_image_small_hover.svg |2 +- icon-themes/colibre_svg/sd/res/placeholder_movie_large.svg |2 +- icon-themes/colibre_svg/sd/res/placeholder_movie_large_hover.svg |2 +- icon-themes/colibre_svg/sd/res/placeholder_movie_small.svg |4 +++- icon-themes/colibre_svg/sd/res/placeholder_movie_small_hover.svg |4 +++- icon-themes/colibre_svg/sd/res/placeholder_table_large.svg |2 +- icon-themes/colibre_svg/sd/res/placeholder_table_large_hover.svg |2 +- icon-themes/colibre_svg/sd/res/placeholder_table_small.svg |3 ++- icon-themes/colibre_svg/sd/res/placehol
[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - sw/source
sw/source/core/doc/docedt.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 9082af9d268908c136b22746f47835bacd361624 Author: Michael Stahl AuthorDate: Wed Jun 10 17:21:45 2020 +0200 Commit: Michael Stahl CommitDate: Thu Jun 11 13:20:22 2020 +0200 crashtesting: sw: fix export of ooo24576-1.doc and ooo79410-1.sxw to odt Crashes because an at-char fly has its anchor node deleted, and during deletion of its text frame its SwAnchoredObject is updated, which asserts because of inconsistent anchor node in the fly and mpAnchorFrame; the immediate cause of the inconsistency is that SwNodes::RemoveNode() changed the fly's anchor node. The root cause is that in the sw_JoinText(bJoinPrev=true) code, a fly anchored at the end of the deleted node isn't moved to the surviving node. SwTextNode::JoinPrev() uses different arguments to ContentIdxStore::Save(), so use the same here. The implementation of several ContentIdxStore functions, including ContentIdxStoreImpl::SaveFlys(), ignore positions that are equal to the passed nContent index, so passing in SwTextNode::Len() looks wrong. (crash is regression from 98d1622b3721fe899c4e1faa0b4cc35695253014) Change-Id: I3a4d54258611da6b15223273a187c39770caa8e2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93583 Tested-by: Jenkins Reviewed-by: Michael Stahl (cherry picked from commit b2b234269b13d5dfd8e7123a25d282d88fee33a0) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96103 diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx index ad9da76b4d6b..07902efe3fd4 100644 --- a/sw/source/core/doc/docedt.cxx +++ b/sw/source/core/doc/docedt.cxx @@ -412,7 +412,7 @@ bool sw_JoinText( SwPaM& rPam, bool bJoinPrev ) pOldTextNd->FormatToTextAttr( pTextNd ); const std::shared_ptr< sw::mark::ContentIdxStore> pContentStore(sw::mark::ContentIdxStore::Create()); -pContentStore->Save( pDoc, aOldIdx.GetIndex(), pOldTextNd->Len() ); +pContentStore->Save(pDoc, aOldIdx.GetIndex(), SAL_MAX_INT32); SwIndex aAlphaIdx(pTextNd); pOldTextNd->CutText( pTextNd, aAlphaIdx, SwIndex(pOldTextNd), ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - 14 commits - cui/source dbaccess/Module_dbaccess.mk dtrans/source filter/source include/oox oox/source sc/source svx/source sw/source
cui/source/inc/autocdlg.hxx |2
cui/source/tabpages/autocdlg.cxx |4
dbaccess/Module_dbaccess.mk |3
dtrans/source/win32/clipb/WinClipbImpl.cxx| 12
dtrans/source/win32/clipb/WinClipbImpl.hxx|1
filter/source/msfilter/eschesdo.cxx | 23 -
include/oox/token/relationship.hxx|1
oox/source/token/relationship.inc |1
sc/source/filter/excel/excdoc.cxx |7
sc/source/filter/excel/xeescher.cxx | 351 --
sc/source/filter/inc/xcl97rec.hxx |2
sc/source/filter/inc/xeescher.hxx | 17 +
sc/source/filter/xcl97/xcl97rec.cxx | 73
svx/source/items/customshapeitem.cxx |2
sw/source/core/crsr/swcrsr.cxx|3
sw/source/core/text/porlay.cxx| 24 +
sw/source/core/undo/undel.cxx | 27 +
sw/source/core/undo/undobj.cxx|8
sw/source/core/undo/untblk.cxx|2
sw/source/filter/ww8/wrtw8nds.cxx |6
sw/source/ui/misc/bookmark.cxx|3
sw/uiconfig/swriter/ui/insertbookmark.ui |7
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 16 -
writerfilter/source/dmapper/NumberingManager.cxx | 38 +-
writerfilter/source/dmapper/NumberingManager.hxx |6
25 files changed, 565 insertions(+), 74 deletions(-)
New commits:
commit eb9641b043ca140c7386732b839ec64425f7084b
Author: Michael Stahl
AuthorDate: Tue Jun 9 11:36:06 2020 +0200
Commit: Andras Timar
CommitDate: Thu Jun 11 13:18:09 2020 +0200
tdf#133641 sw: fix crash double-clicking CH_TXT_ATR_FORMELEMENT
Only search for separator if there is one.
(regression from 1c94842e053a20a739a181d38a35c324df3e62a7)
Change-Id: I6697faa7cb83cab48084f9710f8c5018b9e738e2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95905
Tested-by: Jenkins
Reviewed-by: Michael Stahl
(cherry picked from commit cb28054d831c38ef645f635ecd80475fb5735679)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95979
Reviewed-by: Thorsten Behrens
diff --git a/sw/source/core/crsr/swcrsr.cxx b/sw/source/core/crsr/swcrsr.cxx
index 92b4e941876e..8cfa09e8c9ac 100644
--- a/sw/source/core/crsr/swcrsr.cxx
+++ b/sw/source/core/crsr/swcrsr.cxx
@@ -1405,7 +1405,8 @@ bool SwCursor::SelectWordWT( SwViewShell const *
pViewShell, sal_Int16 nWordType
// Should we select the whole fieldmark?
const IDocumentMarkAccess* pMarksAccess =
GetDoc()->getIDocumentMarkAccess( );
sw::mark::IFieldmark const*const
pMark(pMarksAccess->getFieldmarkFor(*GetPoint()));
-if ( pMark )
+if (pMark && (IDocumentMarkAccess::GetType(*pMark) ==
IDocumentMarkAccess::MarkType::TEXT_FIELDMARK
+ || IDocumentMarkAccess::GetType(*pMark) ==
IDocumentMarkAccess::MarkType::DATE_FIELDMARK))
{
*GetPoint() = sw::mark::FindFieldSep(*pMark);
++GetPoint()->nContent; // Don't select the separator
commit e06b83be93139f7ae3b28fb43a17bec78ed7647b
Author: Michael Stahl
AuthorDate: Wed Jun 10 11:59:00 2020 +0200
Commit: Andras Timar
CommitDate: Thu Jun 11 13:18:03 2020 +0200
tdf#132725 sw: SwUndoDelete: don't group if flys are be deleted
The fly would not be deleted by CanGrouping() but would be deleted later
in RedoImpl() via the IsAtStartOfSection() check so just force a new
Undo action in this case.
(regression from 91b2325808a75174f284c48c8b8afc118fad74e4
and 28b77c89dfcafae82cf2a6d85731b643ff9290e5)
Change-Id: I68f9f6b7fd0306bc0853a370b1030463a0024edc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96002
Tested-by: Jenkins
Reviewed-by: Michael Stahl
(cherry picked from commit 32c162ad1723512763b74d01eaec32c1296f3a55)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96037
Reviewed-by: Thorsten Behrens
diff --git a/sw/source/core/undo/undel.cxx b/sw/source/core/undo/undel.cxx
index c9dc7fdae063..b12696554e65 100644
--- a/sw/source/core/undo/undel.cxx
+++ b/sw/source/core/undo/undel.cxx
@@ -562,6 +562,33 @@ bool SwUndoDelete::CanGrouping( SwDoc* pDoc, const SwPaM&
rDelPam )
rCC.isLetterNumeric( *m_aSttStr, nUChrPos ) )
return false;
+// tdf#132725 - if at-char/at-para flys would be deleted, don't group!
+// DelContentIndex() would be called at the wrong time here, the indexes
+// in the stored SwHistoryTextFlyCnt would be wrong when Undo is invoked
+for (SwFrameFormat const*const pFly : *pDoc->GetSpzFrameFormats())
+{
+SwFormatAnchor const& rAnchor(pFly->GetAnchor());
+switch (rAnchor.GetAnchorId())
+{
+case RndStdIds::FLY_AT_CHAR:
+case RndStdIds::FLY_AT_PARA:
+
Re: Building LO from source
On 11/06/2020 12:35, Ismet Bahadir wrote: I understand, thanks. I'll try that but compiling takes too much time. Can you guess why the extension installs successfully under Ubuntu but fails at Debian? The error message is: Binary URP bridge disposed during call. I'm afraid to face the same error after following your instructions, that's why I'm trying to understand the root cause of the problem. It likely means that the uno -> uno.bin process, spawned from soffice.bin when installing an extension, crashed (and in which case it should have generated a core file, if you have that enabled at the OS level). ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] online.git: loleaflet/js loleaflet/package.json loleaflet/src
loleaflet/js/jquery.mCustomScrollbar.js |4 ++--
loleaflet/package.json |2 +-
loleaflet/src/control/Control.Toolbar.js |2 +-
loleaflet/src/control/Toolbar.js |3 +++
4 files changed, 7 insertions(+), 4 deletions(-)
New commits:
commit 489155f3a747c4b7323b4f1d1186e7722dd44906
Author: gokaysatir
AuthorDate: Wed Jun 10 13:16:31 2020 +0300
Commit: Andras Timar
CommitDate: Thu Jun 11 13:00:52 2020 +0200
leaflet: update jquery package.
Change-Id: I1d637b957808ae5938cf2ee7fe5c3f20e6b9cc52
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95856
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Andras Timar
diff --git a/loleaflet/js/jquery.mCustomScrollbar.js
b/loleaflet/js/jquery.mCustomScrollbar.js
index ffd8e1bba..f147bc2e8 100644
--- a/loleaflet/js/jquery.mCustomScrollbar.js
+++ b/loleaflet/js/jquery.mCustomScrollbar.js
@@ -883,9 +883,9 @@ and dependencies (minified).
_pluginMarkup=function(){
var $this=$(this),d=$this.data(pluginPfx),o=d.opt,
expandClass=o.autoExpandScrollbar ? "
"+classes[1]+"_expand" : "",
- scrollbar=["",""],
+ scrollbar=["",""],
wrapperClass=o.axis==="yx" ?
"mCSB_vertical_horizontal" : o.axis==="x" ? "mCSB_horizontal" : "mCSB_vertical",
- scrollbars=o.axis==="yx" ?
scrollbar[0]+scrollbar[1] : o.axis==="x" ? scrollbar[1] : scrollbar[0],
+ scrollbars=o.axis==="yx" ?
scrollbar[0]+scrollbar[1] : (o.axis==="x" ? scrollbar[1] : scrollbar[0]),
contentWrapper=o.axis==="yx" ? "" : "",
autoHideClass=o.autoHideScrollbar ? "
"+classes[6] : "",
scrollbarDirClass=(o.axis!=="x" &&
d.langDir==="rtl") ? " "+classes[7] : "";
diff --git a/loleaflet/package.json b/loleaflet/package.json
index 7a1aba5d0..d081f4eb9 100644
--- a/loleaflet/package.json
+++ b/loleaflet/package.json
@@ -10,7 +10,7 @@
"d3": "5.16.0",
"eslint": "3.0.0",
"hammerjs": "2.0.8",
-"jquery": "2.2.4",
+"jquery": "3.5.1",
"jquery-contextmenu": "2.9.2",
"jquery-mousewheel": "3.1.13",
"jquery-ui-dist": "1.12.1",
diff --git a/loleaflet/src/control/Control.Toolbar.js
b/loleaflet/src/control/Control.Toolbar.js
index 500ca36b5..4a797ffb0 100644
--- a/loleaflet/src/control/Control.Toolbar.js
+++ b/loleaflet/src/control/Control.Toolbar.js
@@ -476,7 +476,7 @@ function insertShapes(mobile) {
var width = 10;
var $grid = $('.insertshape-grid');
- if ($grid.children().size() > 0)
+ if ($grid.children().length > 0)
return;
for (var s in shapes) {
diff --git a/loleaflet/src/control/Toolbar.js b/loleaflet/src/control/Toolbar.js
index fdeec58af..2f6f28ad6 100644
--- a/loleaflet/src/control/Toolbar.js
+++ b/loleaflet/src/control/Toolbar.js
@@ -612,6 +612,9 @@ L.Map.include({
map.sendUnoCommand('.uno:SetHyperlink',
command);
map.focus();
}
+ else {
+ map.focus();
+ }
}
});
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/js
loleaflet/js/jquery.mCustomScrollbar.js | 786
1 file changed, 393 insertions(+), 393 deletions(-)
New commits:
commit 8ea0b6acbcbe691cd31cabd1a357602591c94860
Author: Andras Timar
AuthorDate: Thu Jun 11 12:15:01 2020 +0200
Commit: Andras Timar
CommitDate: Thu Jun 11 13:00:13 2020 +0200
jquery.mCustomScrollbar.js: whitespace changes only
Change-Id: I23eadea7e0581ab068588af444794697c1d86bb5
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/96113
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Andras Timar
diff --git a/loleaflet/js/jquery.mCustomScrollbar.js
b/loleaflet/js/jquery.mCustomScrollbar.js
index 79bf0521f..ffd8e1bba 100644
--- a/loleaflet/js/jquery.mCustomScrollbar.js
+++ b/loleaflet/js/jquery.mCustomScrollbar.js
@@ -1,8 +1,8 @@
/* -*- js-indent-level: 8; indent-tabs-mode: t; fill-column: 120 -*- */
/*
-== malihu jquery custom scrollbar plugin ==
+== malihu jquery custom scrollbar plugin ==
Version: 3.1.5
-Plugin URI: http://manos.malihu.gr/jquery-custom-content-scroller
+Plugin URI: http://manos.malihu.gr/jquery-custom-content-scroller
Author: malihu
Author URI: http://manos.malihu.gr
License: MIT License (MIT)
@@ -31,10 +31,10 @@ THE SOFTWARE.
*/
/*
-The code below is fairly long, fully commented and should be normally used in
development.
-For production, use either the minified jquery.mCustomScrollbar.min.js script
or
-the production-ready jquery.mCustomScrollbar.concat.min.js which contains the
plugin
-and dependencies (minified).
+The code below is fairly long, fully commented and should be normally used in
development.
+For production, use either the minified jquery.mCustomScrollbar.min.js script
or
+the production-ready jquery.mCustomScrollbar.concat.min.js which contains the
plugin
+and dependencies (minified).
*/
(function(factory){
@@ -55,60 +55,60 @@ and dependencies (minified).
if(_njs){
require("jquery-mousewheel")($);
}else{
- /* load jquery-mousewheel plugin (via CDN) if it's not
present or not loaded via RequireJS
+ /* load jquery-mousewheel plugin (via CDN) if it's not
present or not loaded via RequireJS
(works when mCustomScrollbar fn is called on window
load) */
$.event.special.mousewheel ||
$("head").append(decodeURI("%3Cscript src="+_dlp+"//"+_url+"%3E%3C/script%3E"));
}
}
init();
}(function(){
-
- /*
+
+ /*
- PLUGIN NAMESPACE, PREFIX, DEFAULT SELECTOR(S)
+ PLUGIN NAMESPACE, PREFIX, DEFAULT SELECTOR(S)
*/
-
+
var pluginNS="mCustomScrollbar",
pluginPfx="mCS",
defaultSelector=".mCustomScrollbar",
-
-
-
-
-
- /*
+
+
+
+
+
+ /*
- DEFAULT OPTIONS
+ DEFAULT OPTIONS
*/
-
+
defaults={
/*
- set element/content width/height programmatically
- values: boolean, pixels, percentage
+ set element/content width/height programmatically
+ values: boolean, pixels, percentage
option
default
-
setWidth
false
setHeight
false
*/
/*
- set the initial css top property of content
+ set the initial css top property of content
values: string (e.g. "-100px", "10%" etc.)
*/
setTop:0,
/*
- set the initial css left property of content
+ set the initial css left property of content
values: string (e.g. "-100px", "10%" etc.)
*/
setLeft:0,
- /*
- scrollbar axis (vertical and/or horizontal scrollbars)
+ /*
+ scrollbar axis (vertical and/or horizontal scrollbars)
values (string): "y", "x", "yx"
*/
axis:"y",
/*
- position of scrollbar relative to content
+ position of scrollbar relative to content
[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - 5 commits - debian/changelog loleaflet/css loleaflet/html loleaflet/src loleaflet/welcome loolwsd.spec.in
debian/changelog |6 +
loleaflet/css/toolbar.css | 22 ++-
loleaflet/html/loleaflet.html.m4 |1
loleaflet/src/control/Control.DocumentNameInput.js | 11 +
loleaflet/src/control/Toolbar.js |4 +--
loleaflet/welcome/welcome-de.html | 17 +++---
loleaflet/welcome/welcome-es.html | 18 ---
loleaflet/welcome/welcome-fr.html | 19
loleaflet/welcome/welcome.html | 24 +++--
loolwsd.spec.in|2 -
10 files changed, 79 insertions(+), 45 deletions(-)
New commits:
commit 241eac18d324a2712ff9503946fab74f36349df1
Author: Pedro Pinto Silva
AuthorDate: Wed Jun 10 15:56:34 2020 +0200
Commit: Andras Timar
CommitDate: Thu Jun 11 12:58:28 2020 +0200
Desktop: Set max size for document name's width
Change-Id: Ic35990efd9e240ed29ae9da1e72dcd6b58a4e933
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/96053
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Andras Timar
diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css
index 13eb379d5..20fb595a0 100644
--- a/loleaflet/css/toolbar.css
+++ b/loleaflet/css/toolbar.css
@@ -149,6 +149,19 @@ w2ui-toolbar {
#tb_formulabar_item_formula div table {
width: 100%;
}
+#document-title-pencil.editable {
+ visibility: visible;
+ width: 24px;
+ height: 22px;
+ position: absolute;
+ left: 87%;
+ background: url('images/baseline-edit.svg') right center no-repeat,
radial-gradient(circle, #fff 20%, #fff0 100%);
+ border-top: solid 3px white;
+}
+
+#document-title-pencil:not(.editable){
+ visibility: hidden;
+}
#document-name-input {
font-size: 16px;
@@ -159,25 +172,25 @@ w2ui-toolbar {
#document-name-input.editable {
border: none;
box-shadow: 0 0 0.1px 1px #ebebeb, 0 0 2px 1px #f0f0f0;
- background-image: url('images/baseline-edit.svg');
background-position: right;
background-repeat: no-repeat;
+ padding-right: 24px;
+ max-width: 100%;
}
#document-name-input.editable:focus {
border: none;
box-shadow: inset 0 0 2px 1px #f0f0f0, 0 0 0.1px 1px #bbb;
background-color: white;
+ background-image: none;
}
#document-name-input.editable:hover:not(:focus) {
border: none;
box-shadow: 0 0 0.1px 1px #d7d7d7, 0 0 3px 2px #f0f0f0;
background-color: white;
- background-image: url('images/baseline-edit.svg');
background-position: right;
background-repeat: no-repeat;
- padding-right: 2px;
}
#tb_editbar_item_fold table.w2ui-button {
margin: 0px 14px 0px 4px !important;
diff --git a/loleaflet/html/loleaflet.html.m4 b/loleaflet/html/loleaflet.html.m4
index d3c3e21de..f84271e62 100644
--- a/loleaflet/html/loleaflet.html.m4
+++ b/loleaflet/html/loleaflet.html.m4
@@ -145,6 +145,7 @@ m4_ifelse(MOBILEAPP,[true],
+
diff --git a/loleaflet/src/control/Control.DocumentNameInput.js
b/loleaflet/src/control/Control.DocumentNameInput.js
index 090cc25f9..28db57f41 100644
--- a/loleaflet/src/control/Control.DocumentNameInput.js
+++ b/loleaflet/src/control/Control.DocumentNameInput.js
@@ -65,7 +65,13 @@ L.Control.DocumentNameInput = L.Control.extend({
},
onDocLayerInit: function() {
- $('#document-name-input').attr('size',
$('#document-name-input').val().length);
+ var value = $('#document-name-input').val();
+ if (value.length < 27) {
+ $('#document-name-input').attr('size', value.length);
+ }
+ else {
+ $('#document-name-input').attr('size', '25');
+ }
// FIXME: Android app would display a temporary filename, not
the actual filename
if (window.ThisIsTheAndroidApp) {
@@ -78,6 +84,7 @@ L.Control.DocumentNameInput = L.Control.extend({
// We can now set the document name in the menu bar
$('#document-name-input').prop('disabled', false);
$('#document-name-input').removeClass('editable');
+ $('#document-title-pencil').removeClass('editable');
$('#document-name-input').focus(function() {
$(this).blur(); });
// Call decodecodeURIComponent twice: Reverse both our
encoding and the encoding of
// the name in the file system.
@@ -99,12 +106,14 @@ L.Control.DocumentNameInput = L.Control.extend({
// Save
[Libreoffice-commits] online.git: loleaflet/css loleaflet/html loleaflet/src
loleaflet/css/toolbar.css | 19 ---
loleaflet/html/loleaflet.html.m4 |1 +
loleaflet/src/control/Control.DocumentNameInput.js | 11 ++-
3 files changed, 27 insertions(+), 4 deletions(-)
New commits:
commit 40110f2ba7a53621a0f6c360e7c3bd4803fd6eeb
Author: Pedro Pinto Silva
AuthorDate: Wed Jun 10 15:56:34 2020 +0200
Commit: Andras Timar
CommitDate: Thu Jun 11 12:54:38 2020 +0200
Desktop: Set max size for document name's width
Change-Id: Ic35990efd9e240ed29ae9da1e72dcd6b58a4e933
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/96053
Tested-by: Jenkins
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Andras Timar
diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css
index 13eb379d5..20fb595a0 100644
--- a/loleaflet/css/toolbar.css
+++ b/loleaflet/css/toolbar.css
@@ -149,6 +149,19 @@ w2ui-toolbar {
#tb_formulabar_item_formula div table {
width: 100%;
}
+#document-title-pencil.editable {
+ visibility: visible;
+ width: 24px;
+ height: 22px;
+ position: absolute;
+ left: 87%;
+ background: url('images/baseline-edit.svg') right center no-repeat,
radial-gradient(circle, #fff 20%, #fff0 100%);
+ border-top: solid 3px white;
+}
+
+#document-title-pencil:not(.editable){
+ visibility: hidden;
+}
#document-name-input {
font-size: 16px;
@@ -159,25 +172,25 @@ w2ui-toolbar {
#document-name-input.editable {
border: none;
box-shadow: 0 0 0.1px 1px #ebebeb, 0 0 2px 1px #f0f0f0;
- background-image: url('images/baseline-edit.svg');
background-position: right;
background-repeat: no-repeat;
+ padding-right: 24px;
+ max-width: 100%;
}
#document-name-input.editable:focus {
border: none;
box-shadow: inset 0 0 2px 1px #f0f0f0, 0 0 0.1px 1px #bbb;
background-color: white;
+ background-image: none;
}
#document-name-input.editable:hover:not(:focus) {
border: none;
box-shadow: 0 0 0.1px 1px #d7d7d7, 0 0 3px 2px #f0f0f0;
background-color: white;
- background-image: url('images/baseline-edit.svg');
background-position: right;
background-repeat: no-repeat;
- padding-right: 2px;
}
#tb_editbar_item_fold table.w2ui-button {
margin: 0px 14px 0px 4px !important;
diff --git a/loleaflet/html/loleaflet.html.m4 b/loleaflet/html/loleaflet.html.m4
index d3c3e21de..f84271e62 100644
--- a/loleaflet/html/loleaflet.html.m4
+++ b/loleaflet/html/loleaflet.html.m4
@@ -145,6 +145,7 @@ m4_ifelse(MOBILEAPP,[true],
+
diff --git a/loleaflet/src/control/Control.DocumentNameInput.js
b/loleaflet/src/control/Control.DocumentNameInput.js
index 090cc25f9..28db57f41 100644
--- a/loleaflet/src/control/Control.DocumentNameInput.js
+++ b/loleaflet/src/control/Control.DocumentNameInput.js
@@ -65,7 +65,13 @@ L.Control.DocumentNameInput = L.Control.extend({
},
onDocLayerInit: function() {
- $('#document-name-input').attr('size',
$('#document-name-input').val().length);
+ var value = $('#document-name-input').val();
+ if (value.length < 27) {
+ $('#document-name-input').attr('size', value.length);
+ }
+ else {
+ $('#document-name-input').attr('size', '25');
+ }
// FIXME: Android app would display a temporary filename, not
the actual filename
if (window.ThisIsTheAndroidApp) {
@@ -78,6 +84,7 @@ L.Control.DocumentNameInput = L.Control.extend({
// We can now set the document name in the menu bar
$('#document-name-input').prop('disabled', false);
$('#document-name-input').removeClass('editable');
+ $('#document-title-pencil').removeClass('editable');
$('#document-name-input').focus(function() {
$(this).blur(); });
// Call decodecodeURIComponent twice: Reverse both our
encoding and the encoding of
// the name in the file system.
@@ -99,12 +106,14 @@ L.Control.DocumentNameInput = L.Control.extend({
// Save As allowed
$('#document-name-input').prop('disabled', false);
$('#document-name-input').addClass('editable');
+ $('#document-title-pencil').addClass('editable');
$('#document-name-input').off('keypress',
this.onDocumentNameKeyPress).on('keypress',
this.onDocumentNameKeyPress.bind(this));
$('#document-name-input').off('focus',
this.onDocumentNameFocus).on('focus', this.o
[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - lotuswordpro/source
lotuswordpro/source/filter/lwprowlayout.cxx |5 -
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 37d818a65429cde5b3eb6c5a1a95012894d039d7
Author: Caolán McNamara
AuthorDate: Thu Jun 11 09:31:44 2020 +0100
Commit: Caolán McNamara
CommitDate: Thu Jun 11 12:53:02 2020 +0200
ofz#23300 infinite loop
Change-Id: I0ee67e8efefa48942357340cae46bd7ece27e5b7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96098
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/lotuswordpro/source/filter/lwprowlayout.cxx
b/lotuswordpro/source/filter/lwprowlayout.cxx
index 56ea0c98ce33..cb350f891fa1 100644
--- a/lotuswordpro/source/filter/lwprowlayout.cxx
+++ b/lotuswordpro/source/filter/lwprowlayout.cxx
@@ -406,7 +406,10 @@ void
LwpRowLayout::ConvertCommonRow(rtl::Reference const & pXFTable, sa
auto nNumCols = pConnCell->GetNumcols();
if (!nNumCols)
throw std::runtime_error("loop in conversion");
-nCellEndCol = i + nNumCols - 1;
+auto nNewEndCol = i + nNumCols - 1;
+if (nNewEndCol > std::numeric_limits::max())
+throw std::range_error("column index too large");
+nCellEndCol = nNewEndCol;
i = nCellEndCol;
}
xCell =
pCellLayout->DoConvertCell(pTable->GetObjectID(),crowid,i);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: loleaflet/Makefile.am
loleaflet/Makefile.am |5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 23ebfe20075fdf92e1ac667bfce111f23ad10d3a
Author: Jan Holesovsky
AuthorDate: Thu Jun 11 12:37:11 2020 +0200
Commit: Jan Holesovsky
CommitDate: Thu Jun 11 12:37:11 2020 +0200
Add compilets dependency so that make -j works again.
Change-Id: I185891fbcb340d2d2a94b9e2fe033534da9c2f08
diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index ff2071a04..b79a89f00 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -394,6 +394,7 @@ endif
compilets:
$(srcdir)/node_modules/typescript/bin/tsc
+ @touch $@
build-loleaflet: compilets \
$(LOLEAFLET_L10N_DST) \
@@ -422,13 +423,13 @@ $(DIST_FOLDER)/admin-bundle.js: $(LOLEAFLET_ADMIN_DST) \
$(INTERMEDIATE_DIR)/admin-src.js
@NODE_PATH=$(abs_builddir)/node_modules:$(INTERMEDIATE_DIR) $(NODE)
node_modules/browserify/bin/cmd.js -g browserify-css $(if
$(IS_DEBUG),--debug,-g uglifyify) -o $@ $(srcdir)/admin/main-admin.js
-$(INTERMEDIATE_DIR)/admin-src.js: $(LOLEAFLET_ADMIN_ALL)
+$(INTERMEDIATE_DIR)/admin-src.js: $(LOLEAFLET_ADMIN_ALL) compilets
@mkdir -p $(dir $@)
@echo "Checking for admin JS errors..."
@$(NODE) node_modules/eslint/bin/eslint.js $(srcdir)/admin/src
--ignore-path $(srcdir)/.eslintignore --config $(srcdir)/.eslintrc
@awk 'FNR == 1 {print ""} 1' $(patsubst
%.js,$(srcdir)/%.js,$(LOLEAFLET_ADMIN_JS)) > $@
-$(INTERMEDIATE_DIR)/loleaflet-src.js: $(call prereq_loleaflet)
+$(INTERMEDIATE_DIR)/loleaflet-src.js: $(call prereq_loleaflet) compilets
@mkdir -p $(dir $@)
$(abs_top_srcdir)/scripts/unocommands.py --check $(abs_top_srcdir)
@echo "Checking for loleaflet JS errors..."
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re[2]: Building LO from source
I understand, thanks. I'll try that but compiling takes too much time. Can you guess why the extension installs successfully under Ubuntu but fails at Debian? The error message is: Binary URP bridge disposed during call. I'm afraid to face the same error after following your instructions, that's why I'm trying to understand the root cause of the problem. Regards -- Original Message -- From: "Michael Stahl" To: "Ismet Bahadir" ; libreoffice@lists.freedesktop.org Sent: 11-Jun-20 11:21:58 AM Subject: Re: Building LO from source On 11.06.20 10:13, Ismet Bahadir wrote: My problem is, the .deb file works fine on Ubuntu 18.04 and I can install the extension. However, the same .deb file is installed on Debian-10 but I can't install the extension. well that isn't guaranteed to work anyway and nobody ever tested it. if you want to deploy on different distros, then it's best to build on the same OS as TDF release builds, CentOS 7. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - vcl/unx
vcl/unx/gtk3/gtk3gtkinst.cxx |2 -- 1 file changed, 2 deletions(-) New commits: commit a4aadbdd3a3e5549a383ac6dfd2d3e099eef75a0 Author: Tor Lillqvist AuthorDate: Thu Jun 11 02:18:38 2020 +0300 Commit: Tor Lillqvist CommitDate: Thu Jun 11 12:24:12 2020 +0200 Revert "gtk3: receive mouse events on drawing area" It causes a crash when one does Format > Page Style... in Writer on desktop LibreOffice (with gtk3). This reverts commit 2c7cd737007311d81e3801f3ddb7f11362112f07. Change-Id: I0bc6198f7fd3dff48d8e0614bdefbb30f2214fee Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96077 Tested-by: Jenkins CollaboraOffice Reviewed-by: Tor Lillqvist diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx index 1fac0eede611..d8ec90389bce 100644 --- a/vcl/unx/gtk3/gtk3gtkinst.cxx +++ b/vcl/unx/gtk3/gtk3gtkinst.cxx @@ -11046,8 +11046,6 @@ public: gtk_widget_set_has_tooltip(m_pWidget, true); g_object_set_data(G_OBJECT(m_pDrawingArea), "g-lo-GtkInstanceDrawingArea", this); m_xDevice->EnableRTL(get_direction()); -gtk_widget_add_events(m_pWidget, GDK_BUTTON_PRESS_MASK); -gtk_widget_add_events(m_pWidget, GDK_BUTTON_RELEASE_MASK); } AtkObject* GetAtkObject(AtkObject* pDefaultAccessible) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - sc/qa
sc/qa/uitest/chart/tdf124111.py |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 7ae8722d93c17ca67728c03dfbd520d72fb5f188
Author: Tor Lillqvist
AuthorDate: Thu Jun 11 10:49:15 2020 +0300
Commit: Tor Lillqvist
CommitDate: Thu Jun 11 12:19:23 2020 +0200
This uses an adjustment step of 5 in this branch for some reason
Change-Id: I534b7fdd9c5778b97eebd6dcb5b55d19f8fffe0d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96084
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Tor Lillqvist
diff --git a/sc/qa/uitest/chart/tdf124111.py b/sc/qa/uitest/chart/tdf124111.py
index b9be7858bbe3..b02b902b4ee7 100644
--- a/sc/qa/uitest/chart/tdf124111.py
+++ b/sc/qa/uitest/chart/tdf124111.py
@@ -73,7 +73,7 @@ class tdf124111(UITestCase):
placeMarks = xDialog.getChild("LB_PLACE_TICKS")
self.assertEqual(get_state_as_dict(crossAxis)["SelectEntryText"], "Value")
-self.assertEqual(get_state_as_dict(crossAxisValue)["Text"], "-1")
+self.assertEqual(get_state_as_dict(crossAxisValue)["Text"], "-5")
xOKBtn = xDialog.getChild("ok")
self.ui_test.close_dialog_through_button(xOKBtn)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: lotuswordpro/source
lotuswordpro/source/filter/lwprowlayout.cxx |5 -
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 6e77dcd9d2605e55b57d0a379d87cdd2c48b62f4
Author: Caolán McNamara
AuthorDate: Thu Jun 11 09:31:44 2020 +0100
Commit: Caolán McNamara
CommitDate: Thu Jun 11 12:13:12 2020 +0200
ofz#23300 infinite loop
Change-Id: I0ee67e8efefa48942357340cae46bd7ece27e5b7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96085
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/lotuswordpro/source/filter/lwprowlayout.cxx
b/lotuswordpro/source/filter/lwprowlayout.cxx
index e21505d06420..3321f294469e 100644
--- a/lotuswordpro/source/filter/lwprowlayout.cxx
+++ b/lotuswordpro/source/filter/lwprowlayout.cxx
@@ -404,7 +404,10 @@ void
LwpRowLayout::ConvertCommonRow(rtl::Reference const & pXFTable, sa
auto nNumCols = pConnCell->GetNumcols();
if (!nNumCols)
throw std::runtime_error("loop in conversion");
-nCellEndCol = i + nNumCols - 1;
+auto nNewEndCol = i + nNumCols - 1;
+if (nNewEndCol > std::numeric_limits::max())
+throw std::range_error("column index too large");
+nCellEndCol = nNewEndCol;
i = nCellEndCol;
}
xCell =
pCellLayout->DoConvertCell(pTable->GetObjectID(),crowid,i);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/doc/DocumentContentOperationsManager.cxx |2 ++
sw/source/core/doc/docbm.cxx|7 ++-
sw/source/core/inc/mvsave.hxx |2 ++
sw/source/core/inc/rolbck.hxx |2 ++
sw/source/core/undo/rolbck.cxx |8 ++--
5 files changed, 18 insertions(+), 3 deletions(-)
New commits:
commit ddd9b1bccd87c6913ba4576da8af2d59daf106e9
Author: Serge Krot
AuthorDate: Wed Jun 10 19:15:41 2020 +0200
Commit: Thorsten Behrens
CommitDate: Thu Jun 11 11:55:50 2020 +0200
tdf#101856 copy missing bookmark properties
- in case of undo/redo
- in case of copying bookmark
Change-Id: Ia21f42973b0e7c2cc4abfe2febe9818509aec4d5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96064
Tested-by: Thorsten Behrens
Reviewed-by: Thorsten Behrens
diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx
b/sw/source/core/doc/DocumentContentOperationsManager.cxx
index 4151f9d6b562..12350ceb49d9 100644
--- a/sw/source/core/doc/DocumentContentOperationsManager.cxx
+++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx
@@ -298,6 +298,8 @@ namespace sw
{
pNewBookmark->SetKeyCode(pOldBookmark->GetKeyCode());
pNewBookmark->SetShortName(pOldBookmark->GetShortName());
+pNewBookmark->Hide(pOldBookmark->IsHidden());
+
pNewBookmark->SetHideCondition(pOldBookmark->GetHideCondition());
}
::sw::mark::IFieldmark* const pNewFieldmark =
dynamic_cast< ::sw::mark::IFieldmark* const >(pNewMark);
diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx
index d18d020e8c88..429c2e1129f6 100644
--- a/sw/source/core/doc/docbm.cxx
+++ b/sw/source/core/doc/docbm.cxx
@@ -1690,7 +1690,7 @@ SaveBookmark::SaveBookmark(
const SwNodeIndex & rMvPos,
const SwIndex* pIdx)
: m_aName(rBkmk.GetName())
-, m_aShortName()
+, m_bHidden(false)
, m_aCode()
, m_eOrigBkmType(IDocumentMarkAccess::GetType(rBkmk))
{
@@ -1699,6 +1699,8 @@ SaveBookmark::SaveBookmark(
{
m_aShortName = pBookmark->GetShortName();
m_aCode = pBookmark->GetKeyCode();
+m_bHidden = pBookmark->IsHidden();
+m_aHideCondition = pBookmark->GetHideCondition();
::sfx2::Metadatable const*const pMetadatable(
dynamic_cast< ::sfx2::Metadatable const* >(pBookmark));
@@ -1767,6 +1769,9 @@ void SaveBookmark::SetInDoc(
{
pBookmark->SetKeyCode(m_aCode);
pBookmark->SetShortName(m_aShortName);
+pBookmark->Hide(m_bHidden);
+pBookmark->SetHideCondition(m_aHideCondition);
+
if (m_pMetadataUndo)
{
::sfx2::Metadatable * const pMeta(
diff --git a/sw/source/core/inc/mvsave.hxx b/sw/source/core/inc/mvsave.hxx
index 64064a858023..b0b0c4fc3e34 100644
--- a/sw/source/core/inc/mvsave.hxx
+++ b/sw/source/core/inc/mvsave.hxx
@@ -58,6 +58,8 @@ namespace sw::mark
private:
OUString m_aName;
OUString m_aShortName;
+bool m_bHidden;
+OUString m_aHideCondition;
vcl::KeyCode m_aCode;
IDocumentMarkAccess::MarkType m_eOrigBkmType;
sal_uLong m_nNode1;
diff --git a/sw/source/core/inc/rolbck.hxx b/sw/source/core/inc/rolbck.hxx
index f473ad63b753..1882a68d1d0e 100644
--- a/sw/source/core/inc/rolbck.hxx
+++ b/sw/source/core/inc/rolbck.hxx
@@ -249,6 +249,8 @@ class SwHistoryBookmark : public SwHistoryHint
private:
const OUString m_aName;
OUString m_aShortName;
+bool m_bHidden;
+OUString m_aHideCondition;
vcl::KeyCode m_aKeycode;
const sal_uLong m_nNode;
const sal_uLong m_nOtherNode;
diff --git a/sw/source/core/undo/rolbck.cxx b/sw/source/core/undo/rolbck.cxx
index ceac742f9bbc..2de4c627109e 100644
--- a/sw/source/core/undo/rolbck.cxx
+++ b/sw/source/core/undo/rolbck.cxx
@@ -559,8 +559,7 @@ SwHistoryBookmark::SwHistoryBookmark(
bool bSaveOtherPos)
: SwHistoryHint(HSTRY_BOOKMARK)
, m_aName(rBkmk.GetName())
-, m_aShortName()
-, m_aKeycode()
+, m_bHidden(false)
, m_nNode(bSavePos ?
rBkmk.GetMarkPos().nNode.GetIndex() : 0)
, m_nOtherNode(bSaveOtherPos ?
@@ -579,6 +578,8 @@ SwHistoryBookmark::SwHistoryBookmark(
{
m_aKeycode = pBookmark->GetKeyCode();
m_aShortName = pBookmark->GetShortName();
+m_bHidden = pBookmark->IsHidden();
+m_aHideCondition = pBookmark->GetHideCondition();
::sfx2::Metadatable const*const pMetadatable(
dynamic_cast< ::sfx2::Metadatable const* >(pBookmark));
@@ -653,6 +654,9 @@ void SwHistoryBookmark::SetInDoc( SwDoc* pDoc, bool )
{
pBookmark->SetKeyCode(m_aKeycode);
pBookmark->SetShortName(m_aShortName);
+
[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - sw/source
sw/source/core/doc/DocumentContentOperationsManager.cxx |2 ++
sw/source/core/doc/docbm.cxx|7 ++-
sw/source/core/inc/mvsave.hxx |2 ++
sw/source/core/inc/rolbck.hxx |2 ++
sw/source/core/undo/rolbck.cxx |8 ++--
5 files changed, 18 insertions(+), 3 deletions(-)
New commits:
commit b5e2b9d11d0a32a10709049835cc00b23542d869
Author: Serge Krot
AuthorDate: Wed Jun 10 19:15:41 2020 +0200
Commit: Thorsten Behrens
CommitDate: Thu Jun 11 11:28:22 2020 +0200
tdf#101856 copy missing bookmark properties
- in case of undo/redo
- in case of copying bookmark
Change-Id: Ia21f42973b0e7c2cc4abfe2febe9818509aec4d5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96038
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx
b/sw/source/core/doc/DocumentContentOperationsManager.cxx
index 49920f65d503..8ba8a4c5a136 100644
--- a/sw/source/core/doc/DocumentContentOperationsManager.cxx
+++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx
@@ -297,6 +297,8 @@ namespace sw
{
pNewBookmark->SetKeyCode(pOldBookmark->GetKeyCode());
pNewBookmark->SetShortName(pOldBookmark->GetShortName());
+pNewBookmark->Hide(pOldBookmark->IsHidden());
+
pNewBookmark->SetHideCondition(pOldBookmark->GetHideCondition());
}
::sw::mark::IFieldmark* const pNewFieldmark =
dynamic_cast< ::sw::mark::IFieldmark* const >(pNewMark);
diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx
index bab44aa4a5f5..a9eed445a21c 100644
--- a/sw/source/core/doc/docbm.cxx
+++ b/sw/source/core/doc/docbm.cxx
@@ -1629,7 +1629,7 @@ SaveBookmark::SaveBookmark(
const SwNodeIndex & rMvPos,
const SwIndex* pIdx)
: m_aName(rBkmk.GetName())
-, m_aShortName()
+, m_bHidden(false)
, m_aCode()
, m_eOrigBkmType(IDocumentMarkAccess::GetType(rBkmk))
{
@@ -1638,6 +1638,8 @@ SaveBookmark::SaveBookmark(
{
m_aShortName = pBookmark->GetShortName();
m_aCode = pBookmark->GetKeyCode();
+m_bHidden = pBookmark->IsHidden();
+m_aHideCondition = pBookmark->GetHideCondition();
::sfx2::Metadatable const*const pMetadatable(
dynamic_cast< ::sfx2::Metadatable const* >(pBookmark));
@@ -1706,6 +1708,9 @@ void SaveBookmark::SetInDoc(
{
pBookmark->SetKeyCode(m_aCode);
pBookmark->SetShortName(m_aShortName);
+pBookmark->Hide(m_bHidden);
+pBookmark->SetHideCondition(m_aHideCondition);
+
if (m_pMetadataUndo)
{
::sfx2::Metadatable * const pMeta(
diff --git a/sw/source/core/inc/mvsave.hxx b/sw/source/core/inc/mvsave.hxx
index bdbab23f08ab..c472b6f7bc1a 100644
--- a/sw/source/core/inc/mvsave.hxx
+++ b/sw/source/core/inc/mvsave.hxx
@@ -58,6 +58,8 @@ namespace sw { namespace mark
private:
OUString const m_aName;
OUString m_aShortName;
+bool m_bHidden;
+OUString m_aHideCondition;
vcl::KeyCode m_aCode;
IDocumentMarkAccess::MarkType const m_eOrigBkmType;
sal_uLong m_nNode1;
diff --git a/sw/source/core/inc/rolbck.hxx b/sw/source/core/inc/rolbck.hxx
index 2abe1d590b88..7cceb86a58e6 100644
--- a/sw/source/core/inc/rolbck.hxx
+++ b/sw/source/core/inc/rolbck.hxx
@@ -249,6 +249,8 @@ class SwHistoryBookmark : public SwHistoryHint
private:
const OUString m_aName;
OUString m_aShortName;
+bool m_bHidden;
+OUString m_aHideCondition;
vcl::KeyCode m_aKeycode;
const sal_uLong m_nNode;
const sal_uLong m_nOtherNode;
diff --git a/sw/source/core/undo/rolbck.cxx b/sw/source/core/undo/rolbck.cxx
index ef4815a1cff4..50ff24aa4d98 100644
--- a/sw/source/core/undo/rolbck.cxx
+++ b/sw/source/core/undo/rolbck.cxx
@@ -559,8 +559,7 @@ SwHistoryBookmark::SwHistoryBookmark(
bool bSaveOtherPos)
: SwHistoryHint(HSTRY_BOOKMARK)
, m_aName(rBkmk.GetName())
-, m_aShortName()
-, m_aKeycode()
+, m_bHidden(false)
, m_nNode(bSavePos ?
rBkmk.GetMarkPos().nNode.GetIndex() : 0)
, m_nOtherNode(bSaveOtherPos ?
@@ -579,6 +578,8 @@ SwHistoryBookmark::SwHistoryBookmark(
{
m_aKeycode = pBookmark->GetKeyCode();
m_aShortName = pBookmark->GetShortName();
+m_bHidden = pBookmark->IsHidden();
+m_aHideCondition = pBookmark->GetHideCondition();
::sfx2::Metadatable const*const pMetadatable(
dynamic_cast< ::sfx2::Metadatable const* >(pBookmark));
@@ -653,6 +654,9 @@ void SwHistoryBookmark::SetInDoc( SwDoc* pDoc, bool )
{
pBookmark->SetKeyCode(m_aKeycode);
pBookmark->SetShortName(m_aShortNam
[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - sw/qa writerfilter/source
sw/qa/extras/ooxmlexport/data/tdf132754.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport14.cxx | 16
writerfilter/source/dmapper/NumberingManager.cxx |4 +++-
3 files changed, 19 insertions(+), 1 deletion(-)
New commits:
commit 10abc94f9b3b223747f9dffd8d43f277343c8e1c
Author: Vasily Melenchuk
AuthorDate: Sun May 10 00:43:59 2020 +0300
Commit: Thorsten Behrens
CommitDate: Thu Jun 11 11:27:31 2020 +0200
tdf#132754: DOCX import: changed default list start nubmer
Default value for list numbering startAt is zero. If it is not
proveded numbering starts from this value.
Change-Id: I2cf7be9063e7bfb8b72d6ba77fcd9507e33bb848
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93899
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
(cherry picked from commit f8211e84a5239de25fe6dc45a4bb6b6f8673a1ee)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96048
diff --git a/sw/qa/extras/ooxmlexport/data/tdf132754.docx
b/sw/qa/extras/ooxmlexport/data/tdf132754.docx
new file mode 100644
index ..baec54f5e0d7
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf132754.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
index f410c889375d..ca870b54e06b 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport14.cxx
@@ -351,6 +351,22 @@ DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf128889,
"tdf128889.fodt")
assertXPath(pXml, "/w:document/w:body/w:p[1]/w:r[2]/w:br", "type", "page");
}
+DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf132754, "tdf132754.docx")
+{
+{
+uno::Reference xPara(getParagraph(1),
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString("0.0.0."), getProperty(xPara,
"ListLabelString"));
+}
+{
+uno::Reference xPara(getParagraph(2),
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString("0.0.1."), getProperty(xPara,
"ListLabelString"));
+}
+{
+uno::Reference xPara(getParagraph(3),
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString("0.0.2."), getProperty(xPara,
"ListLabelString"));
+}
+}
+
DECLARE_OOXMLEXPORT_TEST(testTdf129353, "tdf129353.docx")
{
CPPUNIT_ASSERT_EQUAL(8, getParagraphs());
diff --git a/writerfilter/source/dmapper/NumberingManager.cxx
b/writerfilter/source/dmapper/NumberingManager.cxx
index 322c99200230..a00e780ad240 100644
--- a/writerfilter/source/dmapper/NumberingManager.cxx
+++ b/writerfilter/source/dmapper/NumberingManager.cxx
@@ -187,8 +187,10 @@ uno::Sequence
ListLevel::GetLevelProperties(bool bDefaults
{
std::vector aNumberingProperties;
-if( m_nIStartAt >= 0)
+if (m_nIStartAt >= 0)
aNumberingProperties.push_back(lcl_makePropVal(PROP_START_WITH,
m_nIStartAt) );
+else if (bDefaults)
+
aNumberingProperties.push_back(lcl_makePropVal(PROP_START_WITH, 0));
sal_Int16 nNumberFormat = ConversionHelper::ConvertNumberingType(m_nNFC);
if( m_nNFC >= 0)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/doc/docedt.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b2b234269b13d5dfd8e7123a25d282d88fee33a0 Author: Michael Stahl AuthorDate: Wed Jun 10 17:21:45 2020 +0200 Commit: Michael Stahl CommitDate: Thu Jun 11 11:14:01 2020 +0200 crashtesting: sw: fix export of ooo24576-1.doc and ooo79410-1.sxw to odt Crashes because an at-char fly has its anchor node deleted, and during deletion of its text frame its SwAnchoredObject is updated, which asserts because of inconsistent anchor node in the fly and mpAnchorFrame; the immediate cause of the inconsistency is that SwNodes::RemoveNode() changed the fly's anchor node. The root cause is that in the sw_JoinText(bJoinPrev=true) code, a fly anchored at the end of the deleted node isn't moved to the surviving node. SwTextNode::JoinPrev() uses different arguments to ContentIdxStore::Save(), so use the same here. The implementation of several ContentIdxStore functions, including ContentIdxStoreImpl::SaveFlys(), ignore positions that are equal to the passed nContent index, so passing in SwTextNode::Len() looks wrong. (crash is regression from 98d1622b3721fe899c4e1faa0b4cc35695253014) Change-Id: I3a4d54258611da6b15223273a187c39770caa8e2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93583 Tested-by: Jenkins Reviewed-by: Michael Stahl diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx index ad9da76b4d6b..07902efe3fd4 100644 --- a/sw/source/core/doc/docedt.cxx +++ b/sw/source/core/doc/docedt.cxx @@ -412,7 +412,7 @@ bool sw_JoinText( SwPaM& rPam, bool bJoinPrev ) pOldTextNd->FormatToTextAttr( pTextNd ); const std::shared_ptr< sw::mark::ContentIdxStore> pContentStore(sw::mark::ContentIdxStore::Create()); -pContentStore->Save( pDoc, aOldIdx.GetIndex(), pOldTextNd->Len() ); +pContentStore->Save(pDoc, aOldIdx.GetIndex(), SAL_MAX_INT32); SwIndex aAlphaIdx(pTextNd); pOldTextNd->CutText( pTextNd, aAlphaIdx, SwIndex(pOldTextNd), ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Changes to 'refs/tags/cp-6.2-16'
Tag 'cp-6.2-16' created by Andras Timar at 2020-06-11 09:02 + cp-6.2-16 Changes since CP-Android-iOS-4.2.0-1: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/tags/cp-6.2-16'
Tag 'cp-6.2-16' created by Andras Timar at 2020-06-11 09:02 + cp-6.2-16 Changes since cp-6.2-15-10: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Changes to 'refs/tags/cp-6.2-16'
Tag 'cp-6.2-16' created by Andras Timar at 2020-06-11 09:02 + cp-6.2-16 Changes since CODE-4.2.2-2: Andras Timar (1): [cp] add info about xapian omega search and the cp-query template --- xapian/cp-query | 141 ++ xapian/xapian.txt | 109 + 2 files changed, 250 insertions(+) --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 7f122373e0c86499985655e67d4bf7270a34ade1 Author: Andras Timar AuthorDate: Thu Jun 11 11:01:49 2020 +0200 Commit: Andras Timar CommitDate: Thu Jun 11 11:01:53 2020 +0200 Bump version to 6.2-16 Change-Id: I18a7348c19fa9209dc24a43db508a3361fedb9d3 diff --git a/configure.ac b/configure.ac index 05d22de09247..5bbb00efe8f4 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([Collabora Office],[6.2.10.15],[],[],[https://collaboraoffice.com/]) +AC_INIT([Collabora Office],[6.2.10.16],[],[],[https://collaboraoffice.com/]) AC_PREREQ([2.59]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/cp-6.2-16'
Tag 'cp-6.2-16' created by Andras Timar at 2020-06-11 09:02 + cp-6.2-16 Changes since CP-Android-iOS-4.2.0: Andras Timar (1): tdf#130999 fix registration of Greek dictionary --- el_GR/META-INF/manifest.xml |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: Changes to 'refs/tags/cp-4.2.4-4'
Tag 'cp-4.2.4-4' created by Andras Timar at 2020-06-11 08:58 + cp-4.2.4-4 Changes since cp-4.2.4-3-10: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
