Re: ESC meeting agenda: 2021-06-24 16:00 Berlin time
Am 24.06.21 um 00:50 schrieb Thorsten Behrens: * Crash Reporting (from crashreport.libreoffice.org) + 5.2.0.0 1228(+0) + 5.2.0.1 7754(+6) + 5.2.0.2 717(+1) + 5.2.0.3 802(+1) + 5.2.0.4 178908(+166) + 5.2.1.1 5060(+5) + 5.2.1.2 143739(+137) + 5.2.2.1 137(+0) + 5.2.2.2 189958(+172) + 5.2.3.1 2495(+7) + 5.2.3.2 350(+0) + 5.2.3.3 280289(+371) + 5.2.4.1 2853(+2) + 5.2.4.2 1688088(+2083) + 5.2.5.1 169408(+150) + 5.2.6.1 96(+0) + 5.2.6.2 188815(+459) + 5.2.7.1 135(+1) + 5.2.7.2 148862(+242) + 5.3.0.0 4354(+2) + 5.3.0.1 10786(+10) + 5.3.0.2 987(+2) + 5.3.0.3 239619(+336) + 5.3.1.1 370(+1) + 5.3.1.2 93136(+118) + 5.3.2.1 172(+0) + 5.3.2.2 170627(+201) + 5.3.3.1 496(+0) + 5.3.3.2 240068(+327) + 5.3.4.1 51(+0) + 5.3.4.2 142913(+182) + 5.3.5.1 74(+0) + 5.3.5.2 27742(+50) + 5.3.6.1 117971(+137) + 5.3.7.2 112632(+253) + 5.4.0.0 644(+0) + 5.4.0.1 1192(+2) + 5.4.0.2 233(+1) + 5.4.0.3 131252(+177) + 5.4.1.2 193195(+278) + 5.4.2.1 341(+1) + 5.4.2.2 202118(+312) + 5.4.3.1 283(+0) + 5.4.3.2 146885(+255) + 5.4.4.1 359(+2) + 5.4.4.2 117267(+318) + 5.4.5.1 74208(+185) + 5.4.6.1 41(+0) + 5.4.6.2 63189(+117) + 5.4.7.1 722(+0) + 5.4.7.2 73031(+234) + 6.0.0.0 1167(+0) + 6.0.0.1 1652(+5) + 6.0.0.2 2236(+5) + 6.0.0.3 176960(+331) + 6.0.1.1 79712(+168) + 6.0.2.1 116985(+262) + 6.0.3.1 48(+0) + 6.0.3.2 100293(+236) + 6.0.4.1 217(+0) + 6.0.4.2 159014(+477) + 6.0.5.1 363(+0) + 6.0.5.2 115533(+278) + 6.0.6.1 78(+0) + 6.0.6.2 124985(+265) + 6.0.7.1 138(+3) + 6.0.7.2 120(+0) + 6.0.7.3 92880(+284) + 6.1.0.0 802(+0) + 6.1.0.1 542(+3) + 6.1.0.2 413(+1) + 6.1.0.3 153808(+359) + 6.1.1.1 477(+0) + 6.1.1.2 74389(+147) + 6.1.2.1 216026(+495) + 6.1.3.1 302(+0) + 6.1.3.2 150886(+421) + 6.1.4.1 187(+0) + 6.1.4.2 129406(+442) + 6.1.5.1 795(+4) + 6.1.5.2 162356(+851) + 6.1.6.2 51(+0) + 6.1.6.3 106682(+681) + 6.2.0.0 867(+0) + 6.2.0.1 534(+3) + 6.2.0.2 739(+0) + 6.2.0.3 111695(+396) + 6.2.1.1 397(+2) + 6.2.1.2 57456(+256) + 6.2.2.1 774(+9) + 6.2.2.2 93377(+346) + 6.2.3.1 142(+1) + 6.2.3.2 90170(+314) + 6.2.4.1 221(+0) + 6.2.4.2 138788(+594) + 6.2.5.2 115747(+545) + 6.2.6.2 26645(+246) + 6.2.7.1 97672(+810) + 6.2.8.2 84042(+595) + 6.3.0.1 670(+2) + 6.3.0.2 1494(+8) + 6.3.0.3 293(+0) + 6.3.0.4 324426(+1864) + 6.3.1.1 551(+7) + 6.3.1.2 86288(+348) + 6.3.2.2 117111(+617) + 6.3.3.1 141(+1) + 6.3.3.2 144857(+742) + 6.3.4.2 135873(+820) + 6.3.5.2 67262(+507) + 6.3.6.2 77741(+720) + 6.4.0.1 1664(+1) + 6.4.0.2 506(+0) + 6.4.0.3 249006(+1489) + 6.4.1.2 101082(+661) + 6.4.2.2 134229(+740) + 6.4.3.2 134889(+960) + 6.4.4.2 189309(+2009) + 6.4.5.2 76581(+857) + 6.4.6.2 62941(+778) + 6.4.7.2 53337(+1274) + 7.0.0.0 3074(+12) + 7.0.0.2 472(+2) + 7.0.0.3 127722(+1361) + 7.0.1.2 138476(+1726) + 7.0.2.2 65197(+874) + 7.0.3.1 154674(+2381) + 7.0.4.1 43(+4) + 7.0.4.2 116993(+2617) + 7.0.5.2 25162(+1370) + 7.0.6.2 4898(+1311) + 7.1.0.0 275(+6) + 7.1.0.1 385(+2) + 7.1.0.2 338(+2) + 7.1.0.3 109436(+2883) + 7.1.1.2 87701(+3094) + 7.1.2.2 65267(+3735) + 7.1.3.2 39420(+6406) + 7.1.4.2 3669(+2505) + 7.2.0.0 812(+74) How to read this list? Just looking at the "largest" data point: > + 5.2.4.21 688 088 (+2083) Does that mean that when you took the data, there were 2083 crashes in the last 7d reported and this version had ~1.7 million crashes since its release? … if my interpretation is correct, someone needs an update from 5.2.4.2 and https://crashreport.libreoffice.org defaults to 7d… No idea how many users even report crashes, so I also neither know, if this data has even relevance in some way. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: ESC meeting agenda: 2021-06-24 16:00 Berlin time
On 24.06.2021 10:08, Jan-Marek Glogowski wrote: Am 24.06.21 um 00:50 schrieb Thorsten Behrens: * Crash Reporting (from crashreport.libreoffice.org) + 5.2.0.0 1228(+0) + 5.2.0.1 7754(+6) + 5.2.0.2 717(+1) + 5.2.0.3 802(+1) + 5.2.0.4 178908(+166) + 5.2.1.1 5060(+5) + 5.2.1.2 143739(+137) + 5.2.2.1 137(+0) + 5.2.2.2 189958(+172) + 5.2.3.1 2495(+7) + 5.2.3.2 350(+0) + 5.2.3.3 280289(+371) + 5.2.4.1 2853(+2) + 5.2.4.2 1688088(+2083) + 5.2.5.1 169408(+150) + 5.2.6.1 96(+0) + 5.2.6.2 188815(+459) + 5.2.7.1 135(+1) + 5.2.7.2 148862(+242) + 5.3.0.0 4354(+2) + 5.3.0.1 10786(+10) + 5.3.0.2 987(+2) + 5.3.0.3 239619(+336) + 5.3.1.1 370(+1) + 5.3.1.2 93136(+118) + 5.3.2.1 172(+0) + 5.3.2.2 170627(+201) + 5.3.3.1 496(+0) + 5.3.3.2 240068(+327) + 5.3.4.1 51(+0) + 5.3.4.2 142913(+182) + 5.3.5.1 74(+0) + 5.3.5.2 27742(+50) + 5.3.6.1 117971(+137) + 5.3.7.2 112632(+253) + 5.4.0.0 644(+0) + 5.4.0.1 1192(+2) + 5.4.0.2 233(+1) + 5.4.0.3 131252(+177) + 5.4.1.2 193195(+278) + 5.4.2.1 341(+1) + 5.4.2.2 202118(+312) + 5.4.3.1 283(+0) + 5.4.3.2 146885(+255) + 5.4.4.1 359(+2) + 5.4.4.2 117267(+318) + 5.4.5.1 74208(+185) + 5.4.6.1 41(+0) + 5.4.6.2 63189(+117) + 5.4.7.1 722(+0) + 5.4.7.2 73031(+234) + 6.0.0.0 1167(+0) + 6.0.0.1 1652(+5) + 6.0.0.2 2236(+5) + 6.0.0.3 176960(+331) + 6.0.1.1 79712(+168) + 6.0.2.1 116985(+262) + 6.0.3.1 48(+0) + 6.0.3.2 100293(+236) + 6.0.4.1 217(+0) + 6.0.4.2 159014(+477) + 6.0.5.1 363(+0) + 6.0.5.2 115533(+278) + 6.0.6.1 78(+0) + 6.0.6.2 124985(+265) + 6.0.7.1 138(+3) + 6.0.7.2 120(+0) + 6.0.7.3 92880(+284) + 6.1.0.0 802(+0) + 6.1.0.1 542(+3) + 6.1.0.2 413(+1) + 6.1.0.3 153808(+359) + 6.1.1.1 477(+0) + 6.1.1.2 74389(+147) + 6.1.2.1 216026(+495) + 6.1.3.1 302(+0) + 6.1.3.2 150886(+421) + 6.1.4.1 187(+0) + 6.1.4.2 129406(+442) + 6.1.5.1 795(+4) + 6.1.5.2 162356(+851) + 6.1.6.2 51(+0) + 6.1.6.3 106682(+681) + 6.2.0.0 867(+0) + 6.2.0.1 534(+3) + 6.2.0.2 739(+0) + 6.2.0.3 111695(+396) + 6.2.1.1 397(+2) + 6.2.1.2 57456(+256) + 6.2.2.1 774(+9) + 6.2.2.2 93377(+346) + 6.2.3.1 142(+1) + 6.2.3.2 90170(+314) + 6.2.4.1 221(+0) + 6.2.4.2 138788(+594) + 6.2.5.2 115747(+545) + 6.2.6.2 26645(+246) + 6.2.7.1 97672(+810) + 6.2.8.2 84042(+595) + 6.3.0.1 670(+2) + 6.3.0.2 1494(+8) + 6.3.0.3 293(+0) + 6.3.0.4 324426(+1864) + 6.3.1.1 551(+7) + 6.3.1.2 86288(+348) + 6.3.2.2 117111(+617) + 6.3.3.1 141(+1) + 6.3.3.2 144857(+742) + 6.3.4.2 135873(+820) + 6.3.5.2 67262(+507) + 6.3.6.2 77741(+720) + 6.4.0.1 1664(+1) + 6.4.0.2 506(+0) + 6.4.0.3 249006(+1489) + 6.4.1.2 101082(+661) + 6.4.2.2 134229(+740) + 6.4.3.2 134889(+960) + 6.4.4.2 189309(+2009) + 6.4.5.2 76581(+857) + 6.4.6.2 62941(+778) + 6.4.7.2 53337(+1274) + 7.0.0.0 3074(+12) + 7.0.0.2 472(+2) + 7.0.0.3 127722(+1361) + 7.0.1.2 138476(+1726) + 7.0.2.2 65197(+874) + 7.0.3.1 154674(+2381) + 7.0.4.1 43(+4) + 7.0.4.2 116993(+2617) + 7.0.5.2 25162(+1370) + 7.0.6.2 4898(+1311) + 7.1.0.0 275(+6) + 7.1.0.1 385(+2) + 7.1.0.2 338(+2) + 7.1.0.3 109436(+2883) + 7.1.1.2 87701(+3094) + 7.1.2.2 65267(+3735) + 7.1.3.2 39420(+6406) + 7.1.4.2 3669(+2505) + 7.2.0.0 812(+74) How to read this list? Just looking at the "largest" data point: > + 5.2.4.2 1 688 088 (+2083) Does that mean that when you took the data, there were 2083 crashes in the last 7d reported and this version had ~1.7 million crashes since its release? … if my interpretation is correct, someone needs an update from 5.2.4.2 and https://crashreport.libreoffice.org defaults to 7d… No idea how many users even report crashes, so I also neither know, if this data has even relevance in some way. 5.2.4.2 was a know faulty release, and obviously there are die-hard addicts/supporters of that crash-only release. Seriously though, to be usable, these statistics would need comparison to relevant number of crashes of different versions by related time passed from release, normalized by download number for that releas
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - comphelper/qa include/comphelper
comphelper/qa/unit/test_traceevent.cxx | 67 --
include/comphelper/traceevent.hxx | 72 +
2 files changed, 22 insertions(+), 117 deletions(-)
New commits:
commit a2641e3856b72d194d39d88013dad2d6f3c4c9d3
Author: Tor Lillqvist
AuthorDate: Wed Jun 23 13:05:36 2021 +0300
Commit: Tor Lillqvist
CommitDate: Thu Jun 24 09:30:52 2021 +0200
The Chrome Trace Event viewer doesn't support nested async events
Instead of nestable b(egin) and e(nd) events, generate the allegedly
deprecated S(tart)' and F(inish) events.
Makes the code simpler. (And AsyncEvent is still unused. Unclear
whether adding it was based on a misunderstanding.)
Change-Id: Ic029b67e0951dda775c0d0af009f2e431ae55e53
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117700
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117737
Tested-by: Jenkins CollaboraOffice
diff --git a/comphelper/qa/unit/test_traceevent.cxx
b/comphelper/qa/unit/test_traceevent.cxx
index 8bd34595e397..6f768c09d466 100644
--- a/comphelper/qa/unit/test_traceevent.cxx
+++ b/comphelper/qa/unit/test_traceevent.cxx
@@ -40,17 +40,12 @@ void trace_event_test()
// This will not generate any 'b' and 'e' events either
auto pAsync1(std::make_shared("async1"));
-std::weak_ptr pAsync2;
{
// No 'X' by this either
comphelper::ProfileZone aZone1("block1");
// Now we turn on recording
comphelper::TraceEvent::startRecording();
-
-// As this is nested in the parent that was created with recording
turned off,
-// this will not generate any 'b' and 'e' events either even if
recording is now on.
-pAsync2 = comphelper::AsyncEvent::createWithParent("async2in1",
pAsync1);
}
// This will generate an 'i' event for instant1
@@ -70,20 +65,13 @@ void trace_event_test()
// Leaving this scope will generate an 'X' event for block2
}
-// Verify that the weak_ptr to pAsync2 has expired as its parent
pAsync1 has been finished off
-CPPUNIT_ASSERT(pAsync2.expired());
-
// This will generate a 'b' event for async3
auto pAsync3(std::make_shared(
"async3", std::map({ { "foo", "bar" }, {
"tem", "42" } })));
-std::weak_ptr pAsync4;
-
{
comphelper::ProfileZone aZone3("block3");
-pAsync4 = comphelper::AsyncEvent::createWithParent("async4in3",
pAsync3);
-
// Leaving this scope will generate an 'X' event for block3
}
@@ -96,32 +84,8 @@ void trace_event_test()
comphelper::TraceEvent::addInstantEvent(
"instant2", std::map({ { "foo2", "bar2" }, {
"tem2", "42" } }));
-std::weak_ptr pAsync5;
-{
-auto pAsync4Locked = pAsync4.lock();
-CPPUNIT_ASSERT(pAsync4Locked);
-// This will generate a 'b' event for async5in4
-pAsync5 = comphelper::AsyncEvent::createWithParent("async5in4",
pAsync4Locked);
-}
-
-CPPUNIT_ASSERT(!pAsync5.expired());
-
-// This will generate a 'b' event for async6in5
-std::weak_ptr pAsync6(
-comphelper::AsyncEvent::createWithParent("async6in5",
pAsync5.lock()));
-CPPUNIT_ASSERT(!pAsync6.expired());
-
-// This will generate an 'e' event for async6in5 and async5in4
-pAsync5.lock()->finish();
-
-pAsync7Locked = comphelper::AsyncEvent::createWithParent("async7in3",
pAsync3).lock();
-
-CPPUNIT_ASSERT(pAsync6.expired());
-
// Leaving this scope will generate 'X' events for test2 and a
-// 'e' event for async4in3, async7in3, and async3. The
-// pAsync7Locked pointer will now point to an AsyncEvent
-// object that has already had its 'e' event generated.
+// 'e' event for async4in3, async7in3, and async3.
}
// This incorrect use of overlapping (not nested) ProfileZones
@@ -130,9 +94,6 @@ void trace_event_test()
auto p2 = new comphelper::ProfileZone("error2");
delete p1;
delete p2;
-
-// Nothing is generated from this
-pAsync7Locked.reset();
}
}
@@ -145,28 +106,20 @@ void TestTraceEvent::test()
std::cerr << s << "\n";
}
-CPPUNIT_ASSERT_EQUAL(17, static_cast(aEvents.size()));
+CPPUNIT_ASSERT_EQUAL(9, static_cast(aEvents.size()));
CPPUNIT_ASSERT(aEvents[0].startsWith("{\"name:\"instant1\",\"ph\":\"i\","));
-
CPPUNIT_ASSERT(aEvents[1].startsWith("{\"name\":\"async2.5\",\"ph\":\"b\",\"id\":1,"));
+
CPPUNIT_ASSERT(aEvents[1].startsWith("{\"name\":\"async2.5\",\"ph\":\"S\",\"id\":1,"));
CPPUNIT_ASSERT(aEvents[2].startsWith("{\"name\":\"block2\",\"ph\":\"X\","));
CPPUNIT_ASSERT(aEvents[3].startsWith(
-
"{\"name\":\"async3\",\"ph\":\"b\",\"id\"
[Libreoffice-commits] core.git: xmlhelp/source
xmlhelp/source/cxxhelp/provider/databases.hxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ff74a6eb3b4656e396368a41552699c6b642cfa4 Author: Caolán McNamara AuthorDate: Wed Jun 23 20:47:38 2021 +0100 Commit: Caolán McNamara CommitDate: Thu Jun 24 09:39:55 2021 +0200 error: unknown type name 'OStringBuffer' Change-Id: I28a4a2581e6afb02aeb137932fbf884b109e4b5c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117748 Tested-by: Jenkins Reviewed-by: Caolán McNamara diff --git a/xmlhelp/source/cxxhelp/provider/databases.hxx b/xmlhelp/source/cxxhelp/provider/databases.hxx index 5f1d44ef9298..e5cdf10fde52 100644 --- a/xmlhelp/source/cxxhelp/provider/databases.hxx +++ b/xmlhelp/source/cxxhelp/provider/databases.hxx @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include #include ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/inc vcl/unx
vcl/inc/unx/gtk/gtkinst.hxx | 13 +
vcl/unx/gtk3/gtkinst.cxx| 20
2 files changed, 17 insertions(+), 16 deletions(-)
New commits:
commit 29c429e636a94cd07117bffd40c25b114d2e620f
Author: Caolán McNamara
AuthorDate: Tue Jun 22 16:24:24 2021 +0100
Commit: Caolán McNamara
CommitDate: Thu Jun 24 09:40:19 2021 +0200
rename read_paste_result to read_transfer_result
we'll reuse what worked for clipboard for dnd
Change-Id: If8accc2d236253a734f48929e231bcecbb00741f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117744
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/vcl/inc/unx/gtk/gtkinst.hxx b/vcl/inc/unx/gtk/gtkinst.hxx
index 3aaa03d1ddb6..e13524d8c54e 100644
--- a/vcl/inc/unx/gtk/gtkinst.hxx
+++ b/vcl/inc/unx/gtk/gtkinst.hxx
@@ -55,6 +55,19 @@ class GtkSalFrame;
#if GTK_CHECK_VERSION(4, 0, 0)
gint gtk_dialog_run(GtkDialog *dialog);
+
+struct text_transfer_result
+{
+OUString sText;
+bool bDone = false;
+};
+
+struct read_transfer_result
+{
+css::uno::Sequence aSeq;
+bool bDone = false;
+};
+
#endif
struct VclToGtkHelper
diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index 40e23ae7d7ac..4d02d6da480e 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -680,22 +680,10 @@ GdkClipboard* clipboard_get(SelectionType eSelection)
#if GTK_CHECK_VERSION(4, 0, 0)
-struct text_paste_result
-{
-OUString sText;
-bool bDone = false;
-};
-
-struct read_paste_result
-{
-Sequence aSeq;
-bool bDone = false;
-};
-
void text_async_completed(GObject* source, GAsyncResult* res, gpointer data)
{
GdkClipboard* clipboard = GDK_CLIPBOARD(source);
-text_paste_result* pRes = static_cast(data);
+text_transfer_result* pRes = static_cast(data);
gchar* pText = gdk_clipboard_read_text_finish(clipboard, res, nullptr);
pRes->sText = OUString(pText, pText ? strlen(pText) : 0,
RTL_TEXTENCODING_UTF8);
@@ -709,7 +697,7 @@ void text_async_completed(GObject* source, GAsyncResult*
res, gpointer data)
void read_async_completed(GObject* source, GAsyncResult* res, gpointer data)
{
GdkClipboard* clipboard = GDK_CLIPBOARD(source);
-read_paste_result* pRes = static_cast(data);
+read_transfer_result* pRes = static_cast(data);
if (GInputStream* pResult = gdk_clipboard_read_finish(clipboard, res,
nullptr, nullptr))
{
@@ -768,7 +756,7 @@ public:
aRet <<= aStr.replaceAll("\r\n", "\n");
#else
SalInstance* pInstance = GetSalData()->m_pInstance;
-text_paste_result aRes;
+text_transfer_result aRes;
gdk_clipboard_read_text_async(clipboard, nullptr,
text_async_completed, &aRes);
while (!aRes.bDone)
pInstance->DoYield(true, false);
@@ -783,7 +771,7 @@ public:
#if GTK_CHECK_VERSION(4, 0, 0)
SalInstance* pInstance = GetSalData()->m_pInstance;
-read_paste_result aRes;
+read_transfer_result aRes;
const char *mime_types[] = { it->second.getStr(), nullptr };
gdk_clipboard_read_async(clipboard,
mime_types,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/ui/dbgui/scuiasciiopt.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit 6d30c51f1f69d8c31b30b4e08a97222363852b17 Author: Andreas Heinisch AuthorDate: Wed Jun 23 23:11:54 2021 +0200 Commit: Andreas Heinisch CommitDate: Thu Jun 24 09:56:38 2021 +0200 tdf#69207 - Use selected text delimiter to parse the provided csv data Change-Id: Ie260cb57956cd450398746c7f51629d37d14a324 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117750 Tested-by: Jenkins Reviewed-by: Andreas Heinisch diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx b/sc/source/ui/dbgui/scuiasciiopt.cxx index 93032a5d913e..6757aab5572a 100644 --- a/sc/source/ui/dbgui/scuiasciiopt.cxx +++ b/sc/source/ui/dbgui/scuiasciiopt.cxx @@ -435,6 +435,8 @@ ScImportAsciiDlg::ScImportAsciiDlg(weld::Window* pParent, const OUString& aDatNa // *** Separator characters *** lcl_FillCombo( *mxCbTextSep, gaTextSepList, mcTextSep ); mxCbTextSep->set_entry_text(sTextSeparators); +// tdf#69207 - use selected text delimiter to parse the provided data +mcTextSep = lcl_CharFromCombo(*mxCbTextSep, gaTextSepList); Link aSeparatorClickHdl =LINK( this, ScImportAsciiDlg, SeparatorClickHdl ); mxCbTextSep->connect_changed( LINK( this, ScImportAsciiDlg, SeparatorComboBoxHdl ) ); ___ 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/unocore/unostyle.cxx | 11 +++
1 file changed, 7 insertions(+), 4 deletions(-)
New commits:
commit 066c4054f4a1078602aaab5516590628eaf6a47e
Author: Noel Grandin
AuthorDate: Wed Jun 23 12:09:02 2021 +0200
Commit: Noel Grandin
CommitDate: Thu Jun 24 10:00:03 2021 +0200
tdf#135316 bypass 'existing style' check when importing
trust the import filter to have already de-duplicated styles
Shaves 5% off my load time
Change-Id: I36b5196762483f629a38e00156d2fe9a1cb28c97
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117759
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sw/source/core/unocore/unostyle.cxx
b/sw/source/core/unocore/unostyle.cxx
index ac72abefd161..fd5c6037e4a9 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -932,10 +932,13 @@ void XStyleFamily::insertByName(const OUString& rName,
const uno::Any& rElement)
throw uno::RuntimeException();
OUString sStyleName;
SwStyleNameMapper::FillUIName(rName, sStyleName, m_rEntry.m_aPoolId);
-SfxStyleSheetBase* pBase = m_pBasePool->Find(sStyleName,
m_rEntry.m_eFamily);
-SfxStyleSheetBase* pUINameBase = m_pBasePool->Find(sStyleName,
m_rEntry.m_eFamily);
-if(pBase || pUINameBase)
-throw container::ElementExistException();
+if (!m_pDocShell->GetDoc()->IsInWriterfilterImport())
+{
+SfxStyleSheetBase* pBase = m_pBasePool->Find(sStyleName,
m_rEntry.m_eFamily);
+SfxStyleSheetBase* pUINameBase = m_pBasePool->Find(sStyleName,
m_rEntry.m_eFamily);
+if(pBase || pUINameBase)
+throw container::ElementExistException();
+}
if(rElement.getValueType().getTypeClass() != uno::TypeClass_INTERFACE)
throw lang::IllegalArgumentException();
if (SwGetPoolIdFromName::CellStyle == m_rEntry.m_aPoolId)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - drawinglayer/source emfio/qa svgio/qa svx/qa
drawinglayer/source/tools/emfphelperdata.cxx | 267 --
drawinglayer/source/tools/primitive2dxmldump.cxx | 82 +++--
emfio/qa/cppunit/emf/EmfImportTest.cxx| 46 ++-
emfio/qa/cppunit/emf/data/TestDrawStringWithBrush.emf |binary
svgio/qa/cppunit/SvgImportTest.cxx|4
svx/qa/unit/sdr.cxx |8
svx/qa/unit/svdraw.cxx|6
7 files changed, 216 insertions(+), 197 deletions(-)
New commits:
commit 1eb828add814108d63ea61e38d948a0337fc4ee6
Author: Bartosz Kosiorek
AuthorDate: Wed Jun 23 16:55:21 2021 +0200
Commit: Xisco Fauli
CommitDate: Thu Jun 24 10:30:30 2021 +0200
EMF+ tdf#142975 Add brush support to DrawString record
Change-Id: Icfcb4199dcd755fb20e14a8166571b6d6e763f2e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117671
Tested-by: Jenkins
Reviewed-by: Bartosz Kosiorek
(cherry picked from commit 9e8c35cc3f1f5e1c08afd46e0d0fbc07f1ff21f9)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117721
Reviewed-by: Xisco Fauli
diff --git a/drawinglayer/source/tools/emfphelperdata.cxx
b/drawinglayer/source/tools/emfphelperdata.cxx
index 1f3143112320..e756b16ff70f 100644
--- a/drawinglayer/source/tools/emfphelperdata.cxx
+++ b/drawinglayer/source/tools/emfphelperdata.cxx
@@ -457,12 +457,14 @@ namespace emfplushelper
color = Color(ColorAlpha, (brushIndexOrColor >> 24),
(brushIndexOrColor >> 16) & 0xff,
(brushIndexOrColor >> 8) & 0xff, brushIndexOrColor &
0xff);
}
-else // we use a pen
+else // we use a brush
{
-const EMFPPen* pen =
static_cast(maEMFPObjects[brushIndexOrColor & 0xff].get());
-if (pen)
+const EMFPBrush* brush =
static_cast(maEMFPObjects[brushIndexOrColor & 0xff].get());
+if (brush)
{
-color = pen->GetColor();
+color = brush->GetColor();
+if (brush->type != BrushTypeSolidColor)
+SAL_WARN("drawinglayer.emf", "EMF+\t\t TODO Brush other
than solid color is not supported");
}
}
return color;
@@ -1527,161 +1529,152 @@ namespace emfplushelper
}
case EmfPlusRecordTypeDrawString:
{
-sal_uInt32 brushId;
-sal_uInt32 formatId;
-sal_uInt32 stringLength;
+sal_uInt32 brushId, formatId, stringLength;
rMS.ReadUInt32(brushId).ReadUInt32(formatId).ReadUInt32(stringLength);
SAL_INFO("drawinglayer.emf", "EMF+\t FontId: " <<
OUString::number(flags & 0xFF));
SAL_INFO("drawinglayer.emf", "EMF+\t BrushId: " <<
BrushIDToString(flags, brushId));
SAL_INFO("drawinglayer.emf", "EMF+\t FormatId: " <<
formatId);
SAL_INFO("drawinglayer.emf", "EMF+\t Length: " <<
stringLength);
-if (flags & 0x8000)
+// read the layout rectangle
+float lx, ly, lw, lh;
+
rMS.ReadFloat(lx).ReadFloat(ly).ReadFloat(lw).ReadFloat(lh);
+
+SAL_INFO("drawinglayer.emf", "EMF+\t DrawString
layoutRect: " << lx << "," << ly << " - " << lw << "x" << lh);
+// parse the string
+const OUString text = read_uInt16s_ToOUString(rMS,
stringLength);
+SAL_INFO("drawinglayer.emf", "EMF+\t DrawString
string: " << text);
+// get the stringFormat from the Object table ( this
is OPTIONAL and may be nullptr )
+const EMFPStringFormat *stringFormat =
dynamic_cast(maEMFPObjects[formatId & 0xff].get());
+// get the font from the flags
+const EMFPFont *font = static_cast< EMFPFont* >(
maEMFPObjects[flags & 0xff].get() );
+if (!font)
{
-// read the layout rectangle
-float lx, ly, lw, lh;
-
rMS.ReadFloat(lx).ReadFloat(ly).ReadFloat(lw).ReadFloat(lh);
-
-SAL_INFO("drawinglayer.emf", "EMF+\t DrawString
layoutRect: " << lx << "," << ly << " - " << lw << "x" << lh);
-// parse the string
-const OUString text = read_uInt16s_ToOUString(rMS,
stringLength);
-SAL_INFO("drawinglayer.emf", "EMF+\t DrawString
string: " << text);
-// get the stringFormat from the Object table (
this is OPTIONAL and may be nullptr )
-const EMFPStringFormat *stringFormat =
dynamic_cast(maEMFPObjects[formatId & 0x
[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - include/oox oox/Library_oox.mk oox/source sw/qa
include/oox/export/DMLPresetShapeExport.hxx | 138 +
oox/Library_oox.mk|1
oox/source/export/DMLPresetShapeExport.cxx| 1287 ++
oox/source/export/shapes.cxx | 15
sw/qa/extras/ooxmlexport/data/testCustomShapePresetExport.odt |binary
sw/qa/extras/ooxmlexport/ooxmlexport16.cxx| 31
6 files changed, 1471 insertions(+), 1 deletion(-)
New commits:
commit 0cfa76c0a1883289f8406551d0494cc2a30df926
Author: Attila Bakos (NISZ)
AuthorDate: Fri May 14 13:53:32 2021 +0200
Commit: Xisco Fauli
CommitDate: Thu Jun 24 10:33:36 2021 +0200
tdf#92525 tdf#142398: fix export of simple custom shapes
Most of the custom shapes were exported with DrawingML custom
geometry instead of DOCX preset shapes, losing their preset type,
adjust handles and text position. Add a preset exporter class to
handle all possible preset shapes later, and fix the export of
the following shapes now: "bevel", "blockArc", "bracePair",
"bracketPair", "hexagon", "octagon", "parallelogram", "plus",
"roundRect" and "triangle".
tdf#92525: keep text position in triangles with different
adjustments, too.
tdf#142398: part 1: export simple shapes as preset shapes.
Change-Id: I6aee74f7670bea8c1fe5909cbf307778ea728669
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115606
Tested-by: László Németh
Reviewed-by: László Németh
(cherry picked from commit 63cd67e5e18f01aca303131e148c80398a181a41)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117715
Tested-by: Jenkins
Reviewed-by: Xisco Fauli
diff --git a/include/oox/export/DMLPresetShapeExport.hxx
b/include/oox/export/DMLPresetShapeExport.hxx
new file mode 100644
index ..1ab460d26845
--- /dev/null
+++ b/include/oox/export/DMLPresetShapeExport.hxx
@@ -0,0 +1,138 @@
+/* -*- 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_OOX_EXPORT_DMLPRESETSHAPEXPORT_HXX
+#define INCLUDED_OOX_EXPORT_DMLPRESETSHAPEXPORT_HXX
+
+#include
+#include
+#include
+#include
+
+#include
+#include
+
+#include
+
+#include
+
+namespace com::sun::star::beans
+{
+struct PropertyValue;
+}
+
+namespace com::sun::star::drawing
+{
+class XShape;
+struct EnhancedCustomShapeAdjustmentValue;
+}
+
+namespace oox::core
+{
+class XmlFilterBase;
+}
+
+namespace oox::drawingml
+{
+/// Class for exporting the custom shapes to OOXML preset ones, if possible.
+/// This functionality needed for keeping the information for the office
programs
+/// about the shape type, and geometry data. Before these shapes were exported
+/// with custom geometry, and they kept their geometry but has no information
+/// about the shape itself. This lead to lost textbox size/position/padding for
+/// example.
+class DMLPresetShapeExporter
+{
+private:
+// the shape to export
+css::uno::Reference m_xShape;
+// the DMLwriter
+DrawingML* m_pDMLexporter;
+// the type of the custom shape (diamond/rectangle/circle/triangle...)
+OUString m_sPresetShapeType;
+// True if the shape has points where its geometry can be modified
+bool m_bHasHandleValues;
+// The first the x the second the y coordinate, of flipping
+std::pair m_bIsFlipped;
+
+// Custom Shape Geometry information for export:
+
+// The adjusting values stored in this sequence:
+css::uno::Sequence
m_AdjustmentValues;
+// Shapes what have adjusting points, the range of these points
+// and the index of the value stored in this sequence:
+css::uno::Sequence>
m_HandleValues;
+
+//TODO:
+//css::awt::Rectangle m_ViewBox;
+//css::uno::Sequence m_Path;
+//css::uno::Sequence m_Equations;
+
+public:
+DMLPresetShapeExporter() = delete;
+~DMLPresetShapeExporter();
+
+DMLPresetShapeExporter(DrawingML* pDMLExporter,
+ css::uno::Reference xShape);
+
+// Writes the preset shape to the xml
+bool WriteShape();
+
+private:
+struct AdjustmentPointValueBase
+{
+double nMaxVal;
+double nMinVal;
+double nCurrVal;
+};
+
+typedef AdjustmentPointValueBase RadiusAdjustmentValue;
+typedef AdjustmentPointValueBase AngleAdjustmentValue;
+typedef AdjustmentPointValueBase XAdjustmentValue;
+typedef AdjustmentPointValueBase YAdjustmentValue;
+
+// Returns true, if the shape has adjusting points
+bool HasHandleValue();
+
+// Returns true if the shape flipped.
+bool IsXFlipped() { return m_bIsFlipped.first; };
+bool IsYFlipped() { return m_bIsFlipped.second; };
+
+// Retur
Minutes from the UX/design meeting 2021-Jun-23
Present: Nissa, Maria, Heiko Tickets/Topics * Discussion of the Calc survey + some fine-tuning still needed + when done share with the design group for discussion + present results at the conference * LibreOffice Writer - Paste Special = LibreOffice Calc - Paste Special + https://bugs.documentfoundation.org/show_bug.cgi?id=130549 + "enhance" the paste special dialog in Writer with formatting options? + sounds not too bad; mockup would be nice => prepare one for further discussion * mismatch between command names and menu label for styles commands in Tools-Customize-Menus -- but they are consistent in "Toolbars" + https://bugs.documentfoundation.org/show_bug.cgi?id=130405 => keep but show additional information such as popop and context label in description/tooltip + DIALOG: Revise Page Style's Page tab + https://bugs.documentfoundation.org/show_bug.cgi?id=101820 + needed/desirable? => no further input, do it OpenPGP_signature Description: OpenPGP digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - sc/source
sc/source/ui/docshell/impex.cxx | 32 +++-
1 file changed, 31 insertions(+), 1 deletion(-)
New commits:
commit 62f01b4c91d402e1828f8ad6b007d0a3594d2d3e
Author: Eike Rathke
AuthorDate: Wed Jun 23 19:41:46 2021 +0200
Commit: Michael Stahl
CommitDate: Thu Jun 24 10:56:39 2021 +0200
Resolves: tdf#143008 Evaluate AM/PM for type date+time text-to-column and
CSV
Change-Id: Ib760b9a103ab4b8ce7f5a158b09fbe11c6617f2a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117747
Reviewed-by: Eike Rathke
Tested-by: Jenkins
(cherry picked from commit d81775f5b12080676ebaf659c5a4c10d64a9074b)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117720
Reviewed-by: Michael Stahl
diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx
index 43d77256a08a..3f86cc86edb7 100644
--- a/sc/source/ui/docshell/impex.cxx
+++ b/sc/source/ui/docshell/impex.cxx
@@ -1036,7 +1036,7 @@ static bool lcl_PutString(
else if ( nColFormat != SC_COL_STANDARD ) // Datumformats
{
const sal_uInt16 nMaxNumberParts = 7; // Y-M-D h:m:s.t
-sal_Int32 nLen = rStr.getLength();
+const sal_Int32 nLen = rStr.getLength();
sal_Int32 nStart[nMaxNumberParts];
sal_Int32 nEnd[nMaxNumberParts];
@@ -1193,6 +1193,36 @@ static bool lcl_PutString(
if (eStatus == rtl_math_ConversionStatus_Ok)
fFrac = fV / 86400.0;
}
+sal_Int32 nPos;
+if (nFound > 3 && 1 <= nHour && nHour <= 12 // nHour 0 and
>=13 can't be AM/PM
+&& (nPos = nEnd[nFound-1] + 1) < nLen)
+{
+// Dreaded AM/PM may be following.
+while (nPos < nLen && rStr[nPos] == ' ')
+++nPos;
+if (nPos < nLen)
+{
+sal_Int32 nStop = nPos;
+while (nStop < nLen && rStr[nStop] != ' ')
+++nStop;
+OUString aAmPm = rStr.copy( nPos, nStop - nPos);
+// For AM only 12 needs to be treated, whereas for PM
+// it must not. Check both, locale and second/English
+// strings.
+if (nHour == 12 &&
+(rTransliteration.isEqual( aAmPm,
pFormatter->GetLocaleData()->getTimeAM()) ||
+ (pSecondTransliteration &&
pSecondTransliteration->isEqual( aAmPm, "AM"
+{
+nHour = 0;
+}
+else if (nHour < 12 &&
+(rTransliteration.isEqual( aAmPm,
pFormatter->GetLocaleData()->getTimePM()) ||
+ (pSecondTransliteration &&
pSecondTransliteration->isEqual( aAmPm, "PM"
+{
+nHour += 12;
+}
+}
+}
pCalendar->setValue( i18n::CalendarFieldIndex::HOUR, nHour );
pCalendar->setValue( i18n::CalendarFieldIndex::MINUTE, nMinute
);
pCalendar->setValue( i18n::CalendarFieldIndex::SECOND, nSecond
);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - vcl/source
vcl/source/gdi/CommonSalLayout.cxx |6 ++
1 file changed, 6 insertions(+)
New commits:
commit 82ec493928ae35d224ffdc735fd8e427c390610c
Author: Caolán McNamara
AuthorDate: Tue Jun 22 17:13:39 2021 +0100
Commit: Michael Stahl
CommitDate: Thu Jun 24 11:00:04 2021 +0200
disable ligatures for monospace fonts
we don't want e.g. a ffi ligature for Courier/Nimbus Mono PS
Change-Id: I292c6e2ea217b511b4affcd8dab4a4bda85ab5da
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117644
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
(cherry picked from commit 744e964619b5c49870ceab7f59daf1272f24cf75)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117713
Reviewed-by: Michael Stahl
diff --git a/vcl/source/gdi/CommonSalLayout.cxx
b/vcl/source/gdi/CommonSalLayout.cxx
index 998e07169c51..3ff45ef722b7 100644
--- a/vcl/source/gdi/CommonSalLayout.cxx
+++ b/vcl/source/gdi/CommonSalLayout.cxx
@@ -333,6 +333,12 @@ bool GenericSalLayout::LayoutText(ImplLayoutArgs& rArgs,
const SalLayoutGlyphs*
maFeatures.push_back({ HB_TAG('k','e','r','n'), 0, 0,
static_cast(-1) });
}
+if (rFontSelData.GetPitch() == PITCH_FIXED)
+{
+SAL_INFO("vcl.harfbuzz", "Disabling ligatures for font: " <<
rFontSelData.maTargetName);
+maFeatures.push_back({ HB_TAG('l','i','g','a'), 0, 0,
static_cast(-1) });
+}
+
ParseFeatures(rFontSelData.maTargetName);
double nXScale = 0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: external/breakpad
external/breakpad/UnpackedTarball_breakpad.mk |1 + external/breakpad/breakpad-no-env.patch.1 | 13 + 2 files changed, 14 insertions(+) New commits: commit 47282cc577eda78b9cceff0860e74ce7b3f121cd Author: Christian Lohmaier AuthorDate: Sat Jun 19 15:57:21 2021 +0200 Commit: Christian Lohmaier CommitDate: Thu Jun 24 11:32:35 2021 +0200 breakpad: don't include the users's env in linux dumps Change-Id: I004b862295686789c0a88dc678bd098d81c76421 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117503 Tested-by: Jenkins Reviewed-by: Christian Lohmaier diff --git a/external/breakpad/UnpackedTarball_breakpad.mk b/external/breakpad/UnpackedTarball_breakpad.mk index 4eb10158ca18..1b92728946cd 100644 --- a/external/breakpad/UnpackedTarball_breakpad.mk +++ b/external/breakpad/UnpackedTarball_breakpad.mk @@ -23,6 +23,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,breakpad,\ external/breakpad/0001-Handle-race-between-ExceptionHandler-SignalHandler-a.patch.1 \ external/breakpad/c++20-allocator.patch \ external/breakpad/breakpad-dump_syms.patch.1 \ + external/breakpad/breakpad-no-env.patch.1 \ )) $(eval $(call gb_UnpackedTarball_add_files,breakpad,src/tools/windows/dump_syms,\ diff --git a/external/breakpad/breakpad-no-env.patch.1 b/external/breakpad/breakpad-no-env.patch.1 new file mode 100644 index ..d1b37bd21868 --- /dev/null +++ b/external/breakpad/breakpad-no-env.patch.1 @@ -0,0 +1,13 @@ +diff -ur breakpad.org/src/client/linux/minidump_writer/minidump_writer.cc breakpad/src/client/linux/minidump_writer/minidump_writer.cc +--- breakpad.org/src/client/linux/minidump_writer/minidump_writer.cc 2021-06-19 15:32:57.258078847 +0200 breakpad/src/client/linux/minidump_writer/minidump_writer.cc 2021-06-19 15:35:07.014082452 +0200 +@@ -289,7 +289,8 @@ + dir.CopyIndex(dir_index++, &dirent); + + dirent.stream_type = MD_LINUX_ENVIRON; +-if (!WriteProcFile(&dirent.location, GetCrashThread(), "environ")) ++// don't include the user's env ++if (true || !WriteProcFile(&dirent.location, GetCrashThread(), "environ")) + NullifyDirectoryEntry(&dirent); + dir.CopyIndex(dir_index++, &dirent); + ___ 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/shared/03/sf_document.xhp | 16
1 file changed, 8 insertions(+), 8 deletions(-)
New commits:
commit a97fbc6bbfbfa214083615868ffccd3ccebf5d37
Author: Rafael Lima
AuthorDate: Thu Jun 24 01:02:06 2021 +0200
Commit: Olivier Hallot
CommitDate: Thu Jun 24 12:42:05 2021 +0200
Fix localization in SF_Document help page
Change-Id: Ie1fb122ca7574aa28ab199ebebbba76975389fa2
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/117722
Tested-by: Jenkins
Reviewed-by: Olivier Hallot
diff --git a/source/text/sbasic/shared/03/sf_document.xhp
b/source/text/sbasic/shared/03/sf_document.xhp
index dfa1bf873..8b0257a4a 100644
--- a/source/text/sbasic/shared/03/sf_document.xhp
+++ b/source/text/sbasic/shared/03/sf_document.xhp
@@ -89,9 +89,9 @@
doc =
CreateScriptService("SFDocuments.Document", "Untitled 1")
-def
RunEvent(event)
-doc =
CreateScriptService("SFDocuments.DocumentEvent", Event)
-# (...)
+def
RunEvent(event)
+
doc = CreateScriptService("SFDocuments.DocumentEvent", Event)
+#
(...)
The use of the prefix
"SFDocuments." while calling the service is optional.
@@ -360,7 +360,7 @@
If
oDoc.CloseDocument(True) Then
'
...
-End If
+End
If
@@ -401,13 +401,13 @@
In the following
examples, the first line gets the names of all forms in the document and the
second line retrieves the Form object of the form named
"Form_A".
-Set FormNames =
oDoc.Forms()
-Set FormA =
oDoc.Forms("Form_A")
+Set
FormNames = oDoc.Forms()
+Set
FormA = oDoc.Forms("Form_A")
-form_names =
doc.Forms()
-form_A =
doc.Forms("Form_A")
+form_names = doc.Forms()
+form_A = doc.Forms("Form_A")
___
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 b4777e8839899f439f5497550fe733dfe208e287 Author: Rafael Lima AuthorDate: Thu Jun 24 12:42:05 2021 +0200 Commit: Gerrit Code Review CommitDate: Thu Jun 24 12:42:05 2021 +0200 Update git submodules * Update helpcontent2 from branch 'master' to a97fbc6bbfbfa214083615868ffccd3ccebf5d37 - Fix localization in SF_Document help page Change-Id: Ie1fb122ca7574aa28ab199ebebbba76975389fa2 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/117722 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index a79ac40adfad..a97fbc6bbfbf 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit a79ac40adfad119a8957200defabe16282ea5204 +Subproject commit a97fbc6bbfbfa214083615868ffccd3ccebf5d37 ___ 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/shared/03/sf_base.xhp |4 +-
source/text/sbasic/shared/03/sf_basic.xhp | 54 +++---
2 files changed, 29 insertions(+), 29 deletions(-)
New commits:
commit 00086866ecd2de7434f851bc4f5fdc8195b5f262
Author: Rafael Lima
AuthorDate: Mon Jun 21 20:53:14 2021 +0200
Commit: Olivier Hallot
CommitDate: Thu Jun 24 12:43:11 2021 +0200
Fix localization in SF_Base and SF_Basic
Change-Id: Ibcd3826af1a89704bf32db833af63fb0b9564cb1
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/117568
Tested-by: Jenkins
Reviewed-by: Olivier Hallot
diff --git a/source/text/sbasic/shared/03/sf_base.xhp
b/source/text/sbasic/shared/03/sf_base.xhp
index 338cb5bf6..d435f00d9 100644
--- a/source/text/sbasic/shared/03/sf_base.xhp
+++ b/source/text/sbasic/shared/03/sf_base.xhp
@@ -259,11 +259,11 @@
Most form documents
are stored in the root of the Base document and they can be opened simply using
their names, as in the example below:
-oDoc.OpenFormDocument("myFormDocument")
+oDoc.OpenFormDocument("myFormDocument")
If form documents are
organized in folders, it becomes necessary to include the folder name to
specify the form document to be opened, as illustrated in the following
example:
-oDoc.OpenFormDocument("myFolder/myFormDocument")
+oDoc.OpenFormDocument("myFolder/myFormDocument")
diff --git a/source/text/sbasic/shared/03/sf_basic.xhp
b/source/text/sbasic/shared/03/sf_basic.xhp
index 9171af063..76495dad1 100644
--- a/source/text/sbasic/shared/03/sf_basic.xhp
+++ b/source/text/sbasic/shared/03/sf_basic.xhp
@@ -47,13 +47,13 @@
- MB_OK,
MB_OKCANCEL, MB_RETRYCANCEL, MB_YESNO, MB_YESNOCANCEL
+ MB_OK, MB_OKCANCEL, MB_RETRYCANCEL, MB_YESNO,
MB_YESNOCANCEL
Yes
- integer
+ Integer
Values:
0, 1, 5, 4, 3
@@ -61,13 +61,13 @@
- MB_ICONEXCLAMATION, MB_ICONINFORMATION, MB_ICONQUESTION,
MB_ICONSTOP
+ MB_ICONEXCLAMATION, MB_ICONINFORMATION, MB_ICONQUESTION,
MB_ICONSTOP
Yes
- integer
+ Integer
Values:
48, 64, 32, 16
@@ -75,13 +75,13 @@
- MB_ABORTRETRYIGNORE, MB_DEFBUTTON1, MB_DEFBUTTON2,
MB_DEFBUTTON3
+ MB_ABORTRETRYIGNORE, MB_DEFBUTTON1, MB_DEFBUTTON2,
MB_DEFBUTTON3
Yes
- integer
+ Integer
Values:
2, 128, 256, 512
@@ -89,13 +89,13 @@
- IDABORT,
IDCANCEL, IDIGNORE, IDNO, IDOK, IDRETRY, IDYES
+ IDABORT, IDCANCEL, IDIGNORE, IDNO, IDOK, IDRETRY,
IDYES
Yes
- integer
+ Integer
Values:
3, 2, 5, 7, 1, 4, 6Constants indicating MsgBox
selected button.
@@ -103,7 +103,7 @@
- StarDesktop
+ StarDesktop
Yes
@@ -281,7 +281,7 @@
svc.CreateUnoService(servicename: str):
uno
-
servicename : A fully qualified service name such as
"com.sun.star.ui.dialogs.FilePicker" or
'com.sun.star.sheet.FunctionAccess'.
+ servicename: A fully qualified service
name such as com.sun.star.ui.dialogs.FilePicker or
com.sun.star.sheet.FunctionAccess.
dsk
= svc.CreateUnoService('com.sun.star.frame.Desktop')
@@ -300,10 +300,10 @@
interval: A string expression from the following table, specifying
the date or time interval.
- number:
A numerical expression specifying how often the interval
value will be added when positive or subtracted when negative.
- date: A
given datetime.datetime value, the interval value will be
added number times to this date/time value.
+ number:
A numerical expression specifying how often the interval
value will be added when positive or subtracted when negative.
+ date: A
given datetime.datetime value, the
interval value will be added number times
to this datetime.datetime value.
- A datetime.datetime
value.
+ A
datetime.datetime value.
dt =
datetime.datetime(2004, 1, 31)
@@ -322,8 +322,8 @@
svc.DateDiff(interval: str, date1: datetime, date2:
datetime, firstdayofweek = 1, firstweekofyear = 1): int
-
interval: A string expression specifying the date interval, as
detailed in above DateAdd method.
- date1,
date2: The two datetime.datetime values to be compared.
+ interval: A string expression
specifying the date interval, as detailed in above DateAdd
method.
+ date1,
date2: The two datetime.datetime values to be
compared.
A number.
@@ -342,13 +342,13 @@
Basic service;DatePart
DatePart
- The DatePart function
returns a specified part of a date.
+ The
DatePart function returns a sp
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 52955244be35ce4465294cfb742bd6a524e5e49e Author: Rafael Lima AuthorDate: Thu Jun 24 12:43:11 2021 +0200 Commit: Gerrit Code Review CommitDate: Thu Jun 24 12:43:11 2021 +0200 Update git submodules * Update helpcontent2 from branch 'master' to 00086866ecd2de7434f851bc4f5fdc8195b5f262 - Fix localization in SF_Base and SF_Basic Change-Id: Ibcd3826af1a89704bf32db833af63fb0b9564cb1 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/117568 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index a97fbc6bbfbf..00086866ecd2 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit a97fbc6bbfbfa214083615868ffccd3ccebf5d37 +Subproject commit 00086866ecd2de7434f851bc4f5fdc8195b5f262 ___ 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/shared/03/sf_calc.xhp | 16
1 file changed, 8 insertions(+), 8 deletions(-)
New commits:
commit 01e2e91dcfb2a6d07eec0f9188189213fa464592
Author: Rafael Lima
AuthorDate: Tue Jun 22 19:10:48 2021 +0200
Commit: Olivier Hallot
CommitDate: Thu Jun 24 12:44:00 2021 +0200
Fix localization in SF_Calc help page
This patch silences a few strings for translantion. It also rephrases the
first 2 paragraphs of the Calc service that were inaccurate.
Change-Id: Ic2ce5e2c5e53134d80717cd97f63bec4bd726a9b
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/117641
Tested-by: Jenkins
Reviewed-by: Olivier Hallot
diff --git a/source/text/sbasic/shared/03/sf_calc.xhp
b/source/text/sbasic/shared/03/sf_calc.xhp
index 9ef1d166c..1dbf6c509 100644
--- a/source/text/sbasic/shared/03/sf_calc.xhp
+++ b/source/text/sbasic/shared/03/sf_calc.xhp
@@ -25,8 +25,8 @@
SFDocuments.Calc
service
-The SFDocuments library provides a number
of methods and properties to facilitate the management and handling of
%PRODUCTNAME Calc documents.
-Some methods are generic for all types of documents and are
inherited from the Document service, whereas other methods
are specific for the SF_Calc module.
+The SFDocuments shared library provides a
number of methods and properties to facilitate the management and handling of
%PRODUCTNAME documents.
+Some methods are generic for all types of documents and are
inherited from the SF_Document module, whereas other methods
that are specific for Calc documents are defined in the
SF_Calc module.
The SF_Calc module is focused
on:
@@ -713,7 +713,7 @@
-doc.CopyToRange("SheetX.A1:F10",
"SheetY.C5:J5")
+doc.CopyToRange("SheetX.A1:F10",
"SheetY.C5:J5")
docA
= svcUI.OpenDocument(r"C:\Documents\FileA.ods", hidden = True, readonly =
True)
@@ -796,13 +796,13 @@
In the following
examples, the first line gets the names of all forms stored in "Sheet1" and the
second line retrieves the Form object of the form named
"Form_A" which is stored in "Sheet1".
-Set FormNames =
oDoc.Forms("Sheet1")
-Set FormA =
oDoc.Forms("Sheet1", "Form_A")
+Set
FormNames = oDoc.Forms("Sheet1")
+Set
FormA = oDoc.Forms("Sheet1", "Form_A")
-form_names =
doc.Forms("Sheet1")
-form_A =
doc.Forms("Sheet1", "Form_A")
+form_names = doc.Forms("Sheet1")
+form_A = doc.Forms("Sheet1", "Form_A")
@@ -1089,7 +1089,7 @@
RemoveSheet
Removes an existing
sheet from the document.
-
+
svc.RemoveSheet(sheetname: str): bool
___
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 b8fbb46b0d65cdca007a200c4a882030c2bf8dc9 Author: Rafael Lima AuthorDate: Thu Jun 24 12:44:00 2021 +0200 Commit: Gerrit Code Review CommitDate: Thu Jun 24 12:44:00 2021 +0200 Update git submodules * Update helpcontent2 from branch 'master' to 01e2e91dcfb2a6d07eec0f9188189213fa464592 - Fix localization in SF_Calc help page This patch silences a few strings for translantion. It also rephrases the first 2 paragraphs of the Calc service that were inaccurate. Change-Id: Ic2ce5e2c5e53134d80717cd97f63bec4bd726a9b Reviewed-on: https://gerrit.libreoffice.org/c/help/+/117641 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 00086866ecd2..01e2e91dcfb2 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 00086866ecd2de7434f851bc4f5fdc8195b5f262 +Subproject commit 01e2e91dcfb2a6d07eec0f9188189213fa464592 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
What is the best fit for hindiVowels import? CHARS_PERSIAN or CHARS_NEPALI
Hi, Is anyone here qualified to solve this minor dilemma? In DOCX import, hindiVowels are imported as CHARS_NEPALI, but CHARS_NEPALI is not exported to DOCX. CHARS_PERSIAN however is exported as hindiVowels. DOCX import was provided by commit 9da74fa484772595fa50e188ba2c496a459cbd6b Author: Cédric Bosdonnat on Wed Mar 3 14:27:29 2010 +0100 cbosdo03: Fixed issue 109772. Backported go-oo patch to the CWS DOCX export was provided by commit 91b926d4b9939337f54d6c9f0b940b161dc3437f Author: Mark Hung on Sun Jan 24 16:36:05 2016 +0800 tdf#84317 convert missing numbering types to OOXML tokens. [The easy answer for export is to export them both as hindiVowels. I'm just copying this stuff for DOC import/export, so I'd like to do this the "best" way for import.] Thanks, Justin ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: ESC meeting agenda: 2021-06-24 16:00 Berlin time
Hi, On Thursday, 2021-06-24 10:13:39 +0300, Mike Kaganski wrote: > 5.2.4.2 was a know faulty release, and obviously there are die-hard > addicts/supporters of that crash-only release. It may have been distributed with some Mint (18.1?) version, which could explain why those users don't upgrade. Eike -- GPG key 0x6A6CD5B765632D3A - 2265 D7F3 A7B0 95CC 3918 630B 6A6C D5B7 6563 2D3A signature.asc Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/source
sw/source/core/doc/docfmt.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 3b655ae8314ab4dc5ab56f933231a7ecbcb33238 Author: Noel Grandin AuthorDate: Wed Jun 23 10:41:12 2021 +0200 Commit: Noel Grandin CommitDate: Thu Jun 24 13:24:48 2021 +0200 should be using upper_bound here after commit 1feb59c3dd9e5f714ce894f8de31bbb6869c9f3b Change-Id: I5dde1a776c11b9755e33cd7ccae54f29045b5ea1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117697 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx index 5dc94ff60e82..f6ccbb799b92 100644 --- a/sw/source/core/doc/docfmt.cxx +++ b/sw/source/core/doc/docfmt.cxx @@ -2085,7 +2085,7 @@ std::pairhttps://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - sw/uiconfig
sw/uiconfig/swriter/ui/pagefooterpanel.ui |2 +- sw/uiconfig/swriter/ui/pageformatpanel.ui |2 +- sw/uiconfig/swriter/ui/pageheaderpanel.ui |2 +- sw/uiconfig/swriter/ui/pagestylespanel.ui |2 +- 4 files changed, 4 insertions(+), 4 deletions(-) New commits: commit 7b0c2ce37490e9ac602383f7cb80092b269e38cd Author: Heiko Tietze AuthorDate: Wed Jun 23 14:21:23 2021 +0200 Commit: Heiko Tietze CommitDate: Thu Jun 24 13:36:32 2021 +0200 Resolves tdf#121158 - Placement issues on page sidebar Change-Id: I4e13ca9eac9c86f08c869c8fa9d3fb346c2aa2d2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117710 Tested-by: Jenkins Reviewed-by: Heiko Tietze (cherry picked from commit bd549d04f924355b1f33e953241b7effc8731b6c) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117725 diff --git a/sw/uiconfig/swriter/ui/pagefooterpanel.ui b/sw/uiconfig/swriter/ui/pagefooterpanel.ui index 2dd1f2119f60..c1ffc740cd22 100644 --- a/sw/uiconfig/swriter/ui/pagefooterpanel.ui +++ b/sw/uiconfig/swriter/ui/pagefooterpanel.ui @@ -11,7 +11,7 @@ True False -center +end True True 6 diff --git a/sw/uiconfig/swriter/ui/pageformatpanel.ui b/sw/uiconfig/swriter/ui/pageformatpanel.ui index 42aefea5b493..2eb7cdfe4f5d 100644 --- a/sw/uiconfig/swriter/ui/pageformatpanel.ui +++ b/sw/uiconfig/swriter/ui/pageformatpanel.ui @@ -11,7 +11,7 @@ True False -center +end True True 6 diff --git a/sw/uiconfig/swriter/ui/pageheaderpanel.ui b/sw/uiconfig/swriter/ui/pageheaderpanel.ui index 78d677edbdf4..db9c6b2075f2 100644 --- a/sw/uiconfig/swriter/ui/pageheaderpanel.ui +++ b/sw/uiconfig/swriter/ui/pageheaderpanel.ui @@ -11,7 +11,7 @@ True False -center +end True True 6 diff --git a/sw/uiconfig/swriter/ui/pagestylespanel.ui b/sw/uiconfig/swriter/ui/pagestylespanel.ui index e8ed534ff8f0..09f8b5e4d5c9 100644 --- a/sw/uiconfig/swriter/ui/pagestylespanel.ui +++ b/sw/uiconfig/swriter/ui/pagestylespanel.ui @@ -35,7 +35,7 @@ True False -center +end True True 6 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/qa
sc/qa/uitest/calc_tests/calcSheetDelete.py |8
1 file changed, 8 insertions(+)
New commits:
commit 4feb8e557815151601228bdf0dde01099534b3db
Author: Stephan Bergmann
AuthorDate: Thu Jun 24 10:56:30 2021 +0200
Commit: Stephan Bergmann
CommitDate: Thu Jun 24 14:18:59 2021 +0200
Fix presumed race between executeAction and following asserts in UITest
...where I had observed UITest_calc_tests failing at least once with
> ==
> FAIL: test_delete_more_sheets_at_once (calcSheetDelete.calcSheetDelete)
> --
> Traceback (most recent call last):
> File "sc/qa/uitest/calc_tests/calcSheetDelete.py", line 107, in
test_delete_more_sheets_at_once
> self.assertEqual(document.Sheets.getCount(), nrSheets)
> AssertionError: 7 != 1
>
> ==
> FAIL: test_tdf105105_delete_lots_of_sheets_at_once
(calcSheetDelete.calcSheetDelete)
> --
> Traceback (most recent call last):
> File "sc/qa/uitest/calc_tests/calcSheetDelete.py", line 130, in
test_tdf105105_delete_lots_of_sheets_at_once
> self.assertEqual(document.Sheets.getCount(), nrSheets + 100)
> AssertionError: 100 != 101
>
> ==
> FAIL: test_tdf114228_insert_and_delete_sheet
(calcSheetDelete.calcSheetDelete)
> --
> Traceback (most recent call last):
> File "sc/qa/uitest/calc_tests/calcSheetDelete.py", line 37, in
test_tdf114228_insert_and_delete_sheet
> self.assertEqual(document.Sheets.getCount(), nrSheets)
> AssertionError: 2 != 1
>
> ==
> FAIL: test_tdf43078_insert_and_delete_sheet_insert_text
(calcSheetDelete.calcSheetDelete)
> --
> Traceback (most recent call last):
> File "sc/qa/uitest/calc_tests/calcSheetDelete.py", line 62, in
test_tdf43078_insert_and_delete_sheet_insert_text
> self.assertEqual(document.Sheets.getCount(), nrSheets + 2)
> AssertionError: 2 != 3
Change-Id: Id757571c153b3305644f8e4a099c4dc31bca3c52
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117767
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/sc/qa/uitest/calc_tests/calcSheetDelete.py
b/sc/qa/uitest/calc_tests/calcSheetDelete.py
index ae8867c6f97c..b237003b648d 100644
--- a/sc/qa/uitest/calc_tests/calcSheetDelete.py
+++ b/sc/qa/uitest/calc_tests/calcSheetDelete.py
@@ -33,6 +33,8 @@ class calcSheetDelete(UITestCase):
xDialog = self.xUITest.getTopFocusWindow()
xOKButton = xDialog.getChild("yes")
xOKButton.executeAction("CLICK", tuple())
+xToolkit =
self.xContext.ServiceManager.createInstance('com.sun.star.awt.Toolkit')
+xToolkit.processEventsToIdle()
self.assertEqual(document.Sheets.getCount(), nrSheets)
self.xUITest.executeCommand(".uno:Undo")
@@ -58,6 +60,8 @@ class calcSheetDelete(UITestCase):
xDialog = self.xUITest.getTopFocusWindow()
xOKButton = xDialog.getChild("ok")
xOKButton.executeAction("CLICK", tuple())
+xToolkit =
self.xContext.ServiceManager.createInstance('com.sun.star.awt.Toolkit')
+xToolkit.processEventsToIdle()
self.assertEqual(document.Sheets.getCount(), nrSheets + 2)
xCalcDoc = self.xUITest.getTopFocusWindow()
@@ -104,6 +108,8 @@ class calcSheetDelete(UITestCase):
xOKButton = xDialog.getChild("yes")
xOKButton.executeAction("CLICK", tuple())
+xToolkit =
self.xContext.ServiceManager.createInstance('com.sun.star.awt.Toolkit')
+xToolkit.processEventsToIdle()
self.assertEqual(document.Sheets.getCount(), nrSheets)
self.xUITest.executeCommand(".uno:Undo")
self.assertEqual(document.Sheets.getCount(), nrSheets + 6)
@@ -127,6 +133,8 @@ class calcSheetDelete(UITestCase):
xOKButton = xDialog.getChild("ok")
xOKButton.executeAction("CLICK", tuple())
i = i + 1
+xToolkit =
self.xContext.ServiceManager.createInstance('com.sun.star.awt.Toolkit')
+xToolkit.processEventsToIdle()
self.assertEqual(document.Sheets.getCount(), nrSheets + 100)
i = 0
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 8042e4f910bd9686f74e069e9978bfd47460c96f Author: Christian Lohmaier AuthorDate: Thu Jun 24 14:40:43 2021 +0200 Commit: Gerrit Code Review CommitDate: Thu Jun 24 14:40:43 2021 +0200 Update git submodules * Update translations from branch 'master' to 491af494a983aea54a24d68ff1bc1703d21f0a6c - update translations for 7.2 / master and force-fix errors using pocheck Change-Id: I5f3256dc0a6c1ada3a9a2358b3d4aba8f84b7252 diff --git a/translations b/translations index 47d2e3a3e6f9..491af494a983 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit 47d2e3a3e6f9d4e2b17ff79b3a9cbdbe4619af16 +Subproject commit 491af494a983aea54a24d68ff1bc1703d21f0a6c ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 7ce2e6055baef256ede5388ea6a66bd4eeeb04dc Author: Christian Lohmaier AuthorDate: Thu Jun 24 14:44:56 2021 +0200 Commit: Gerrit Code Review CommitDate: Thu Jun 24 14:44:56 2021 +0200 Update git submodules * Update translations from branch 'libreoffice-7-2' to 2da3ebadd8519e7c67fc9ea0d8d572f69047e332 - update translations for 7.2 / master and force-fix errors using pocheck Change-Id: I5f3256dc0a6c1ada3a9a2358b3d4aba8f84b7252 (cherry picked from commit 491af494a983aea54a24d68ff1bc1703d21f0a6c) diff --git a/translations b/translations index 3aad43a1496a..2da3ebadd851 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit 3aad43a1496ac07c7907227455ad25915491600f +Subproject commit 2da3ebadd8519e7c67fc9ea0d8d572f69047e332 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: chart2/source
chart2/source/controller/sidebar/ChartSeriesPanel.cxx | 13 -
1 file changed, 8 insertions(+), 5 deletions(-)
New commits:
commit 3af7001d0a04fdbcb38a35d0841d7d186beeb57f
Author: Balazs Varga
AuthorDate: Fri Jun 11 12:22:53 2021 +0200
Commit: László Németh
CommitDate: Thu Jun 24 15:12:49 2021 +0200
tdf#142793 chart UI: fix option "Secondary Y Axis" on sidebar
Attaching a data series to the secondary axis didn't enable
the secondary axis at the right side of the chart using the
sidebar (unlike in data series local menu -> Format Data
Series... -> Options).
Test: Click on the chart, select one of the data series, and
enable Data Series -> Align Series to Axis -> Secondary Y Axis.
Change-Id: I2cb99458af724471d4d04cac8c2c9013f41634fe
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117048
Tested-by: László Németh
Reviewed-by: László Németh
diff --git a/chart2/source/controller/sidebar/ChartSeriesPanel.cxx
b/chart2/source/controller/sidebar/ChartSeriesPanel.cxx
index 0550463e4d3c..4e48afa4ac41 100644
--- a/chart2/source/controller/sidebar/ChartSeriesPanel.cxx
+++ b/chart2/source/controller/sidebar/ChartSeriesPanel.cxx
@@ -34,9 +34,12 @@
#include
#include
+#include
#include
#include
+#include
+
using namespace css;
using namespace css::uno;
@@ -212,14 +215,14 @@ bool isPrimaryAxis(const
css::uno::Reference&
void setAttachedAxisType(const css::uno::Reference&
xModel, const OUString& rCID, bool bPrimary)
{
-css::uno::Reference< css::beans::XPropertySet > xSeries(
-ObjectIdentifier::getDataSeriesForCID(rCID, xModel), uno::UNO_QUERY );
+const uno::Reference& xDataSeries =
ObjectIdentifier::getDataSeriesForCID(rCID, xModel);
-if (!xSeries.is())
+if (!xDataSeries.is())
return;
-sal_Int32 nIndex = bPrimary ? 0 : 1;
-xSeries->setPropertyValue("AttachedAxisIndex", css::uno::Any(nIndex));
+uno::Reference xChartDoc(xModel,
css::uno::UNO_QUERY);
+uno::Reference xDiagram = xChartDoc->getFirstDiagram();
+DiagramHelper::attachSeriesToAxis(bPrimary, xDataSeries, xDiagram,
comphelper::getProcessComponentContext());
}
css::uno::Reference getChartType(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - sc/source
sc/source/ui/inc/gridwin.hxx |6 ---
sc/source/ui/view/gridwin.cxx |4 --
sc/source/ui/view/gridwin4.cxx | 62 -
sc/source/ui/view/tabview5.cxx |7
4 files changed, 79 deletions(-)
New commits:
commit 0be41797787622ebb5320acb6ec6cb65a7c8cdd4
Author: Eike Rathke
AuthorDate: Thu Jun 24 11:49:05 2021 +0200
Commit: Eike Rathke
CommitDate: Thu Jun 24 16:04:02 2021 +0200
Revert "tdf#124983 In calc make printable page borders initially visible"
This reverts commit ff3f749cd08851ee4eb0991eabee0327ca081a45.
Reason for revert: reportedly causes crashes and heap corruption on
Windows, see discussion in https://gerrit.libreoffice.org/c/core/+/90101
Change-Id: I84429b55b5fa2b26afd21ef104606ae2f30aad5d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117727
Reviewed-by: Eike Rathke
Tested-by: Jenkins
diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx
index daf6c35b652c..09e46d7a4e21 100644
--- a/sc/source/ui/inc/gridwin.hxx
+++ b/sc/source/ui/inc/gridwin.hxx
@@ -309,10 +309,6 @@ class SAL_DLLPUBLIC_RTTI ScGridWindow : public
vcl::Window, public DropTargetHel
voidInvalidateLOKViewCursor(const tools::Rectangle&
rCursorRect,
const Fraction aScaleX, const
Fraction aScaleY);
-Timer maShowPageBreaksTimer;
-boolbInitialPageBreaks;
-voidSetupInitialPageBreaks(ScDocument& rDoc, SCTAB nTab, bool
bSetup);
-DECL_LINK(InitiatePageBreaksTimer, Timer*, void);
protected:
virtual voidPrePaint(vcl::RenderContext& rRenderContext) override;
virtual voidPaint(vcl::RenderContext& rRenderContext, const
tools::Rectangle& rRect) override;
@@ -494,8 +490,6 @@ public:
void updateLOKValListButton(bool bVisible, const ScAddress& rPos) const;
void updateLOKInputHelp(const OUString& title, const OUString& content)
const;
-void initiatePageBreaks();
-
protected:
void ImpCreateOverlayObjects();
void ImpDestroyOverlayObjects();
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index c2c115c4371c..b6412ae36fbb 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -424,10 +424,6 @@ ScGridWindow::ScGridWindow( vcl::Window* pParent,
ScViewData& rData, ScSplitPos
GetOutDev()->SetDigitLanguage( SC_MOD()->GetOptDigitLanguage() );
EnableRTL( false );
-
-bInitialPageBreaks = true;
-maShowPageBreaksTimer.SetInvokeHandler(LINK(this, ScGridWindow,
InitiatePageBreaksTimer));
-maShowPageBreaksTimer.SetTimeout(1);
}
ScGridWindow::~ScGridWindow()
diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx
index f1e53ed61cb8..9c1ff475449a 100644
--- a/sc/source/ui/view/gridwin4.cxx
+++ b/sc/source/ui/view/gridwin4.cxx
@@ -76,9 +76,6 @@
#include
#include
#include
-#include
-#include
-#include
static void lcl_LimitRect( tools::Rectangle& rRect, const tools::Rectangle&
rVisible )
{
@@ -1270,30 +1267,6 @@ void ScGridWindow::DrawContent(OutputDevice &rDevice,
const ScTableInfo& rTableI
if (mpNoteMarker)
mpNoteMarker->Draw(); // Above the cursor, in drawing map mode
-
-SetupInitialPageBreaks(rDoc, nTab, bPage&& bInitialPageBreaks);
-}
-
-
-void ScGridWindow::SetupInitialPageBreaks(ScDocument& rDoc, SCTAB nTab, bool
bSetup)
-{
-// tdf#124983, if option LibreOfficeDev Calc/View/Visual Aids/Page breaks
-// is enabled, breaks should be visible. If the document is opened the
first
-// time, the breaks are not calculated yet, so for this initialization
-// a timer will be triggered here.
-if (bSetup)
-{
-std::set aColBreaks;
-std::set aRowBreaks;
-rDoc.GetAllColBreaks(aColBreaks, nTab, true, false);
-rDoc.GetAllRowBreaks(aRowBreaks, nTab, true, false);
-if (aColBreaks.size() == 0 || aRowBreaks.size() == 0)
-{
-maShowPageBreaksTimer.SetPriority(TaskPriority::DEFAULT_IDLE);
-maShowPageBreaksTimer.Start();
-bInitialPageBreaks = false;
-}
-}
}
namespace
@@ -2343,39 +2316,4 @@ void ScGridWindow::DataChanged( const DataChangedEvent&
rDCEvt )
Invalidate();
}
-void ScGridWindow::initiatePageBreaks()
-{
-bInitialPageBreaks = true;
-}
-
-IMPL_LINK(ScGridWindow, InitiatePageBreaksTimer, Timer*, pTimer, void)
-{
-if (pTimer == &maShowPageBreaksTimer)
-{
-ScDocument& rDoc = mrViewData.GetDocument();
-const ScViewOptions& rOpts = mrViewData.GetOptions();
-bool bPage = rOpts.GetOption(VOPT_PAGEBREAKS);
-ScDocShell* pDocSh = mrViewData.GetDocShell();
-bool bModified = pDocSh->IsModified();
-// tdf#124983, if option LibreOfficeDev Calc/View/Visual Aids/Page
breaks
-// is enabled, breaks should be visible. If the document is opened the
first
-// time
[Libreoffice-commits] core.git: sw/source
sw/source/uibase/utlui/content.cxx |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit f446a203fa2897bab8ae7686c948a8bf060675c6 Author: Jim Raykowski AuthorDate: Tue Jun 22 21:29:22 2021 -0800 Commit: Jim Raykowski CommitDate: Thu Jun 24 16:50:56 2021 +0200 tdf#46626 Don't include footnote numbers in Navigator headings Change-Id: I8c655c6ed1e1d05407dac27ef19f26c6ca8d8d54 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117692 Tested-by: Jenkins Reviewed-by: Jim Raykowski diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx index f7b6adc04eb8..3fdfb0b01e2d 100644 --- a/sw/source/uibase/utlui/content.cxx +++ b/sw/source/uibase/utlui/content.cxx @@ -630,7 +630,8 @@ void SwContentType::FillMemberList(bool* pbLevelOrVisibilityChanged) continue; // don't hide it, just skip it } OUString aEntry(comphelper::string::stripStart( - m_pWrtShell->getIDocumentOutlineNodesAccess()->getOutlineText(i, m_pWrtShell->GetLayout()), ' ')); + m_pWrtShell->getIDocumentOutlineNodesAccess()->getOutlineText( +i, m_pWrtShell->GetLayout(), true, false, false), ' ')); aEntry = SwNavigationPI::CleanEntry(aEntry); std::unique_ptr pCnt(new SwOutlineContent(this, aEntry, i, nLevel, m_pWrtShell->IsOutlineMovable( i ), nPos )); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: ESC meeting agenda: 2021-06-24 16:00 Berlin time
+ top 10 bugs fixers: McNamara, Caolán 6 Justin Luth 3 Németh, László 3 NISZ LibreOffice Team 2 Nabet, Julien 2 Olivier Hallot 2 Stéphane Guillou 2 1 *UNKNOWN* 1 Andreas Heinisch 1 + top 10 bugs confirmers: Dieter 13 NISZ LibreOffice Team 7 Timur 7 Budea, Áron 5 Heiko Tietze 4 Henschel, Regina 4 Uwe Auer 4 m.a.riosv 4 *UNKNOWN* 3 Foote, V Stuart 3 Is there something amiss, causing the blank and *UNKNOWN* entries? Or are those expected? ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - sc/source
sc/source/ui/dbgui/scuiasciiopt.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit 14af6ffe303090eecd2b42b09da42e5a748cbb9d Author: Andreas Heinisch AuthorDate: Wed Jun 23 23:11:54 2021 +0200 Commit: Xisco Fauli CommitDate: Thu Jun 24 17:23:58 2021 +0200 tdf#69207 - Use selected text delimiter to parse the provided csv data Change-Id: Ie260cb57956cd450398746c7f51629d37d14a324 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117750 Tested-by: Jenkins Reviewed-by: Andreas Heinisch (cherry picked from commit 6d30c51f1f69d8c31b30b4e08a97222363852b17) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117724 Reviewed-by: Xisco Fauli diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx b/sc/source/ui/dbgui/scuiasciiopt.cxx index 93032a5d913e..6757aab5572a 100644 --- a/sc/source/ui/dbgui/scuiasciiopt.cxx +++ b/sc/source/ui/dbgui/scuiasciiopt.cxx @@ -435,6 +435,8 @@ ScImportAsciiDlg::ScImportAsciiDlg(weld::Window* pParent, const OUString& aDatNa // *** Separator characters *** lcl_FillCombo( *mxCbTextSep, gaTextSepList, mcTextSep ); mxCbTextSep->set_entry_text(sTextSeparators); +// tdf#69207 - use selected text delimiter to parse the provided data +mcTextSep = lcl_CharFromCombo(*mxCbTextSep, gaTextSepList); Link aSeparatorClickHdl =LINK( this, ScImportAsciiDlg, SeparatorClickHdl ); mxCbTextSep->connect_changed( LINK( this, ScImportAsciiDlg, SeparatorComboBoxHdl ) ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - vcl/inc vcl/source
vcl/inc/sallayout.hxx|2 +-
vcl/source/gdi/sallayout.cxx | 17 -
vcl/source/outdev/font.cxx | 12
3 files changed, 25 insertions(+), 6 deletions(-)
New commits:
commit f5e565eb0dcee2d7e42180b1fd0ad12555de2a22
Author: Mark Hung
AuthorDate: Mon Jun 14 10:20:42 2021 +0800
Commit: Xisco Fauli
CommitDate: Thu Jun 24 17:25:24 2021 +0200
tdf#142560 handle cached glpyh items in ImplGlyphFallbackLayout
Fallback layout beyond level1 isn't generated because pre-caculated
glyph items does not contain glyph items that needs to fallback, i.e.
when calling ImplLayoutArgs::PrepareFallback. Hence it produce no
maFallbackRuns and maRuns. The patch changes
ImplLayoutArgs::PrepareFallback so that it use pre-caculated glyph
items in the next level to create maRuns to ensure the same fallback
layouts are genrated as layouts generated without pre-caculated glyph
items.
Change-Id: I672f3be6c4915892792b3cb968ad4a325465ccc0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117105
Tested-by: Jenkins
Reviewed-by: Mark Hung
(cherry picked from commit 10ea27faec115d4cffd6f66cee8f688399e1e0b2)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117570
Reviewed-by: Xisco Fauli
diff --git a/vcl/inc/sallayout.hxx b/vcl/inc/sallayout.hxx
index 3852442eeadb..f6783f3cc1ca 100644
--- a/vcl/inc/sallayout.hxx
+++ b/vcl/inc/sallayout.hxx
@@ -114,7 +114,7 @@ public:
// methods used by BiDi and glyph fallback
boolNeedFallback() const
{ return !maFallbackRuns.IsEmpty(); }
-boolPrepareFallback();
+boolPrepareFallback(const SalLayoutGlyphsImpl* pGlyphsImpl);
private:
voidAddRun( int nMinCharPos, int nEndCharPos, bool bRTL );
diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx
index 9f4757148b36..7b8f2c2a2a05 100644
--- a/vcl/source/gdi/sallayout.cxx
+++ b/vcl/source/gdi/sallayout.cxx
@@ -486,8 +486,23 @@ void ImplLayoutArgs::AddRun( int nCharPos0, int nCharPos1,
bool bRTL )
maRuns.AddRun( nCharPos0, nCharPos1, bRTL );
}
-bool ImplLayoutArgs::PrepareFallback()
+bool ImplLayoutArgs::PrepareFallback(const SalLayoutGlyphsImpl* pGlyphsImpl)
{
+// Generate runs with pre-calculated glyph items instead maFallbackRuns.
+if( pGlyphsImpl != nullptr )
+{
+maRuns.Clear();
+maFallbackRuns.Clear();
+
+for (auto const& aGlyphItem : *pGlyphsImpl)
+{
+for(int i = aGlyphItem.charPos(); i < aGlyphItem.charPos() +
aGlyphItem.charCount(); ++i)
+maRuns.AddPos(i, aGlyphItem.IsRTLGlyph());
+}
+
+return !maRuns.IsEmpty();
+}
+
// short circuit if no fallback is needed
if( maFallbackRuns.IsEmpty() )
{
diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx
index b6c7fcff82e3..6c761ec4bf07 100644
--- a/vcl/source/outdev/font.cxx
+++ b/vcl/source/outdev/font.cxx
@@ -1254,7 +1254,7 @@ std::unique_ptr
OutputDevice::ImplGlyphFallbackLayout( std::unique_pt
// prepare multi level glyph fallback
std::unique_ptr pMultiSalLayout;
ImplLayoutRuns aLayoutRuns = rLayoutArgs.maRuns;
-rLayoutArgs.PrepareFallback();
+rLayoutArgs.PrepareFallback(nullptr);
rLayoutArgs.mnFlags |= SalLayoutFlags::ForFallback;
// get list of code units that need glyph fallback
@@ -1267,13 +1267,14 @@ std::unique_ptr
OutputDevice::ImplGlyphFallbackLayout( std::unique_pt
OUString aMissingCodes = aMissingCodeBuf.makeStringAndClear();
FontSelectPattern aFontSelData(mpFontInstance->GetFontSelectPattern());
+SalLayoutGlyphsImpl* pGlyphsImpl = pGlyphs ? pGlyphs->Impl(1) : nullptr;
// try if fallback fonts support the missing code units
for( int nFallbackLevel = 1; nFallbackLevel < MAX_FALLBACK;
++nFallbackLevel )
{
rtl::Reference pFallbackFont;
-if(pGlyphs != nullptr && pGlyphs->Impl(nFallbackLevel) != nullptr)
-pFallbackFont = pGlyphs->Impl(nFallbackLevel)->GetFont();
+if(pGlyphsImpl != nullptr)
+pFallbackFont = pGlyphsImpl->GetFont();
// find a font family suited for glyph fallback
// GetGlyphFallbackFont() needs a valid FontInstance
// if the system-specific glyph fallback is active
@@ -1307,8 +1308,11 @@ std::unique_ptr
OutputDevice::ImplGlyphFallbackLayout( std::unique_pt
pMultiSalLayout->SetIncomplete(true);
}
+if (pGlyphs != nullptr)
+pGlyphsImpl = pGlyphs->Impl(nFallbackLevel + 1);
+
// break when this fallback was sufficient
-if( !rLayoutArgs.PrepareFallback() )
+if( !rLayoutArgs.PrepareFallback(pGlyphsImpl) )
break;
}
___
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' - include/vcl vcl/source
include/vcl/outdev.hxx |2
vcl/source/outdev/textline.cxx | 101 +++--
2 files changed, 100 insertions(+), 3 deletions(-)
New commits:
commit c2559714a7637a659d839d8ac42f6e9263159882
Author: merttumer
AuthorDate: Wed Jun 16 21:04:33 2021 +0300
Commit: Michael Meeks
CommitDate: Thu Jun 24 18:05:18 2021 +0200
Cache a static wavy line as bitmap and reuse it
DrawWaveLine is cpu costly so render it as big as
possible so we can only crop it
Edit:
1) Moved the Cache class to textline.cxx file
as it is local to that
2) Provided a custom hash method for the unordered_map
to avoid double hashing the key. Used boost:hash_combine
for hashing.
3) changed unordered_map to o3tl::lru_map
Change-Id: I0ab191f7bb72ccd5074c78858de9831c1a462b7b
Signed-off-by: merttumer
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117362
Reviewed-by: Michael Meeks
Tested-by: Jenkins CollaboraOffice
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index d9b6651e0c9e..137eda8f533f 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -854,6 +854,8 @@ private:
SAL_DLLPRIVATE void ImplDrawPolyPolygonWithB2DPolyPolygon(const
basegfx::B2DPolyPolygon& rB2DPolyPoly);
///@}
+SAL_DLLPRIVATE void ImplDrawWaveLineBezier(long nStartX, long
nStartY, long nEndX, long nEndY, long nWaveHeight, double fOrientation, long
nLineWidth);
+
/** @name Curved shape functions
*/
diff --git a/vcl/source/outdev/textline.cxx b/vcl/source/outdev/textline.cxx
index e52b02410ebd..452a9dbfdfe9 100644
--- a/vcl/source/outdev/textline.cxx
+++ b/vcl/source/outdev/textline.cxx
@@ -25,6 +25,7 @@
#include
#include
#include
+#include
#include
@@ -33,10 +34,70 @@
#include
#include
+#include
+#include
#define UNDERLINE_LAST LINESTYLE_BOLDWAVE
#define STRIKEOUT_LAST STRIKEOUT_X
+struct WavyLineCache final
+{
+WavyLineCache () : m_aItems( 10 ) {}
+
+bool find( Color aLineColor, size_t nLineWidth, size_t nWaveHeight, size_t
nWordWidth, BitmapEx& rOutput )
+{
+Key aKey = { nWaveHeight, aLineColor.mValue };
+auto item = m_aItems.find( aKey );
+if ( item == m_aItems.end() )
+return false;
+// needs update
+if ( item->second.m_aLineWidth != nLineWidth ||
item->second.m_aWordWidth < nWordWidth )
+{
+return false;
+}
+rOutput = item->second.m_Bitmap;
+return true;
+}
+
+void insert( const BitmapEx& aBitmap, const Color& aLineColor, const
size_t nLineWidth, const size_t nWaveHeight, const size_t nWordWidth, BitmapEx&
rOutput )
+{
+Key aKey = { nWaveHeight, aLineColor.mValue };
+m_aItems.insert( std::pair< Key, WavyLineCacheItem>( aKey, {
nLineWidth, nWordWidth, aBitmap } ) );
+rOutput = aBitmap;
+}
+
+private:
+struct WavyLineCacheItem
+{
+size_t m_aLineWidth;
+size_t m_aWordWidth;
+BitmapEx m_Bitmap;
+};
+
+struct Key
+{
+size_t m_aFirst;
+size_t m_aSecond;
+bool operator ==( const Key& rOther ) const
+{
+return ( m_aFirst == rOther.m_aFirst && m_aSecond ==
rOther.m_aSecond );
+}
+};
+
+struct Hash
+{
+size_t operator() ( const Key& rKey ) const
+{
+size_t aSeed = 0;
+boost::hash_combine(aSeed, rKey.m_aFirst);
+boost::hash_combine(aSeed, rKey.m_aSecond);
+return aSeed;
+}
+};
+
+o3tl::lru_map< Key, WavyLineCacheItem, Hash > m_aItems;
+};
+
void OutputDevice::ImplInitTextLineSize()
{
mpFontInstance->mxFontMetric->ImplInitTextLineSize( this );
@@ -1000,6 +1061,43 @@ void OutputDevice::DrawWaveLine(const Point& rStartPos,
const Point& rEndPos, lo
nLineWidth = 1;
}
+if ( fOrientation == 0.0 )
+{
+static vcl::DeleteOnDeinit< WavyLineCache > snLineCache( new
WavyLineCache() );
+if ( !snLineCache.get() )
+return;
+WavyLineCache& rLineCache = *snLineCache.get();
+BitmapEx aWavylinebmp;
+if ( !rLineCache.find( GetLineColor(), nLineWidth, nWaveHeight, nEndX
- nStartX, aWavylinebmp ) )
+{
+size_t nWordLength = nEndX - nStartX;
+// start with something big to avoid updating it frequently
+nWordLength = nWordLength < 1024 ? 1024 : nWordLength;
+ScopedVclPtrInstance< VirtualDevice > pVirtDev( *this,
DeviceFormat::DEFAULT,
+
DeviceFormat::DEFAULT );
+pVirtDev->SetAntialiasing( AntialiasingFlags::EnableB2dDraw );
+pVirtDev->SetOutputSizePixel( Size( nWordLength, nWaveHeight * 2
), false );
+pVirtDev->SetLineColor( GetLineColor() );
+pVirtDev->SetBackground( Wallpaper( COL_TR
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - vcl/source
vcl/source/bitmap/BitmapScaleSuperFilter.cxx |5 +
1 file changed, 5 insertions(+)
New commits:
commit 26da6f400b098aee119c0afce956891e84bd64a6
Author: Tor Lillqvist
AuthorDate: Thu Jun 24 12:29:10 2021 +0300
Commit: Michael Meeks
CommitDate: Thu Jun 24 18:17:20 2021 +0200
Add ProfileZone to 24- and 32-bit scaleDown/Up in BitmapScaleSuperFilter
Change-Id: Ibc98d1e5ba24f98c437468d3f9a469725892e7d0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117773
Tested-by: Michael Meeks
Reviewed-by: Michael Meeks
diff --git a/vcl/source/bitmap/BitmapScaleSuperFilter.cxx
b/vcl/source/bitmap/BitmapScaleSuperFilter.cxx
index bd6b7bd00b56..af57c98e7dcd 100644
--- a/vcl/source/bitmap/BitmapScaleSuperFilter.cxx
+++ b/vcl/source/bitmap/BitmapScaleSuperFilter.cxx
@@ -17,6 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include
#include
#include
@@ -127,6 +128,7 @@ public:
void scaleUp32bit(ScaleContext &rCtx, long nStartY, long nEndY)
{
+comphelper::ProfileZone pz("BitmapScaleSuperFilter::scaleUp32bit");
const int nColorComponents = 4;
const long nStartX = 0;
@@ -261,6 +263,7 @@ void scaleUpPaletteGeneral(ScaleContext &rCtx, long
nStartY, long nEndY)
void scaleUp24bit(ScaleContext &rCtx, long nStartY, long nEndY)
{
+comphelper::ProfileZone pz("BitmapScaleSuperFilter::scaleUp24bit");
const int nColorComponents = 3;
const long nStartX = 0;
@@ -351,6 +354,7 @@ void scaleUpNonPaletteGeneral(ScaleContext &rCtx, long
nStartY, long nEndY)
void scaleDown32bit(ScaleContext &rCtx, long nStartY, long nEndY)
{
+comphelper::ProfileZone pz("BitmapScaleSuperFilter::scaleDown32bit");
const int constColorComponents = 4;
const long nStartX = 0;
@@ -746,6 +750,7 @@ void scaleDownPaletteGeneral(ScaleContext &rCtx, long
nStartY, long nEndY)
void scaleDown24bit(ScaleContext &rCtx, long nStartY, long nEndY)
{
+comphelper::ProfileZone pz("BitmapScaleSuperFilter::scaleDown24bit");
const int constColorComponents = 3;
const long nStartX = 0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/ww8export/data/tdf104239_sharedOutlineNumId.doc |binary
sw/qa/extras/ww8export/ww8export3.cxx|8
sw/source/filter/ww8/ww8par.cxx |3 ++-
3 files changed, 10 insertions(+), 1 deletion(-)
New commits:
commit 8bfa14e831f31f372b98d7283fa4abc73bcb5532
Author: Justin Luth
AuthorDate: Wed Jun 23 09:21:32 2021 +0200
Commit: Justin Luth
CommitDate: Thu Jun 24 19:21:24 2021 +0200
tdf#104239 doc import: accept outlineLvl0 == (listLvl = MAXLEVEL)
If listLvl is undefined, it is treated as level 0,
so when testing that outlineLvl is equal to listLvl,
then consider MAXLEVEL to be equivalent to zero.
The opposite is not true. An undefined outlineLvl
is not considered to be level 0.
This doesn't fix bug 104239, but it is one step
in the right direction.
Two unit tests followed this path,
(transparent-text.doc and tdf80635_pageLeft.doc)
but neither one sets a numbering style,
so they don't make good unit tests.
Change-Id: I62cd7f5500fcd6dc06327900c33f12c129610a04
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117745
Tested-by: Jenkins
Reviewed-by: Justin Luth
diff --git a/sw/qa/extras/ww8export/data/tdf104239_sharedOutlineNumId.doc
b/sw/qa/extras/ww8export/data/tdf104239_sharedOutlineNumId.doc
new file mode 100644
index ..c5deb4857f9c
Binary files /dev/null and
b/sw/qa/extras/ww8export/data/tdf104239_sharedOutlineNumId.doc differ
diff --git a/sw/qa/extras/ww8export/ww8export3.cxx
b/sw/qa/extras/ww8export/ww8export3.cxx
index 2ecde65c6bfb..77c090f1f22d 100644
--- a/sw/qa/extras/ww8export/ww8export3.cxx
+++ b/sw/qa/extras/ww8export/ww8export3.cxx
@@ -813,6 +813,14 @@
DECLARE_WW8EXPORT_TEST(testTdf106541_inheritOutlineNumbering, "tdf106541_inherit
CPPUNIT_ASSERT_EQUAL(OUString("1.1"), getProperty(xPara,
"ListLabelString"));
}
+DECLARE_WW8EXPORT_TEST(testTdf104239_sharedOutlineNumId,
"tdf104239_sharedOutlineNumId.doc")
+{
+// The list should show both level 1 and level 2 digits. It really ought
to be "2.1."
+uno::Reference xPara(getParagraph(5, "Principes"),
uno::UNO_QUERY);
+// This was ".1." previously.
+CPPUNIT_ASSERT(3 < getProperty(xPara,
"ListLabelString").getLength());
+}
+
DECLARE_WW8EXPORT_TEST(testTdf120394, "tdf120394.doc")
{
CPPUNIT_ASSERT_EQUAL(1, getPages());
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 9721a3f8cf4d..d4c2ddc62cd6 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -6004,9 +6004,10 @@ void SwWW8ImplReader::SetOutlineStyles()
continue;
}
+const sal_uInt8 nLvl = pStyleInf->m_nListLevel == MAXLEVEL ? 0 :
pStyleInf->m_nListLevel;
if (m_pChosenWW8OutlineStyle != nullptr
&& pStyleInf->mnWW8OutlineLevel < WW8ListManager::nMaxLevel
-&& pStyleInf->mnWW8OutlineLevel == pStyleInf->m_nListLevel)
+&& pStyleInf->mnWW8OutlineLevel == nLvl)
{
// LibreOffice's Chapter Numbering only works when outlineLevel ==
listLevel
const SwNumFormat& rRule
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sysui/desktop
sysui/desktop/macosx/Info.plist.in |8
sysui/desktop/menus/startcenter.desktop |2 +-
2 files changed, 9 insertions(+), 1 deletion(-)
New commits:
commit 1bc454a2c0cb0dd69512d69ddd2123a44814197e
Author: Thorsten Behrens
AuthorDate: Sat Dec 19 11:18:34 2020 +0100
Commit: Thorsten Behrens
CommitDate: Thu Jun 24 20:24:22 2021 +0200
Handle fancy webdav URI schemes on all platforms
Change-Id: I5cc16b0fdaf032e90aa0361df6f33c04a615abab
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108016
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens
diff --git a/sysui/desktop/macosx/Info.plist.in
b/sysui/desktop/macosx/Info.plist.in
index f1ce15a5c83e..1bdf4eb02ea2 100644
--- a/sysui/desktop/macosx/Info.plist.in
+++ b/sysui/desktop/macosx/Info.plist.in
@@ -1525,6 +1525,14 @@
vnd.libreoffice.cmis
+
+CFBundleURLName
+@PRODUCTNAME@
+CFBundleURLSchemes
+
+vnd.libreoffice.command
+
+
CFBundleURLName
@PRODUCTNAME@ WebDav
diff --git a/sysui/desktop/menus/startcenter.desktop
b/sysui/desktop/menus/startcenter.desktop
index 3551a750a45f..be551ae27335 100644
--- a/sysui/desktop/menus/startcenter.desktop
+++ b/sysui/desktop/menus/startcenter.desktop
@@ -23,7 +23,7 @@ Icon=startcenter
Type=Application
Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Other;
Exec=${UNIXBASISROOTNAME} %%FILE%%
-MimeType=application/vnd.openofficeorg.extension;x-scheme-handler/vnd.libreoffice.cmis;
+MimeType=application/vnd.openofficeorg.extension;x-scheme-handler/vnd.libreoffice.cmis;x-scheme-handler/vnd.sun.star.webdav;x-scheme-handler/vnd.sun.star.webdavs;x-scheme-handler/vnd.libreoffice.command;
Name=%PRODUCTNAME
GenericName=Office
Comment=The office productivity suite compatible to the open and standardized
ODF document format. Supported by The Document Foundation.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/com
include/com/sun/star/uno/Type.h |4
include/com/sun/star/uno/Type.hxx | 10 --
2 files changed, 14 deletions(-)
New commits:
commit 350fe112c20106e9a53fec4c2f3c0f7fdc496e3f
Author: Noel Grandin
AuthorDate: Thu Jun 24 10:00:47 2021 +0200
Commit: Noel Grandin
CommitDate: Thu Jun 24 20:49:17 2021 +0200
remove uno::Type move constructor
not necessary for the optimisation I was going for, and actually less
efficient than just using the copy constructor
Change-Id: I0f2019a0bf032283fb6c8d5d834603ea7a5ce3c0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117762
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/com/sun/star/uno/Type.h b/include/com/sun/star/uno/Type.h
index 364d9eb5959e..5dc1b41e0bc2 100644
--- a/include/com/sun/star/uno/Type.h
+++ b/include/com/sun/star/uno/Type.h
@@ -119,10 +119,6 @@ public:
*/
inline Type( const Type & rType );
-#if defined LIBO_INTERNAL_ONLY
-inline Type( Type && );
-#endif
-
/** Destructor: Releases acquired C type description reference.
*/
~Type()
diff --git a/include/com/sun/star/uno/Type.hxx
b/include/com/sun/star/uno/Type.hxx
index 5c95adc3bd85..f62d0a17b63a 100644
--- a/include/com/sun/star/uno/Type.hxx
+++ b/include/com/sun/star/uno/Type.hxx
@@ -82,16 +82,6 @@ inline Type::Type( const Type & rType )
::typelib_typedescriptionreference_acquire( _pType );
}
-#if defined LIBO_INTERNAL_ONLY
-inline Type::Type( Type && rType )
-: _pType( rType._pType )
-{
-rType._pType = reinterpret_cast< const ::com::sun::star::uno::Type * >(
-::typelib_static_type_getByTypeClass( typelib_TypeClass_VOID )
)->getTypeLibType();
-::typelib_typedescriptionreference_acquire( rType._pType );
-}
-#endif
-
inline ::rtl::OUString Type::getTypeName() const
{
return ::rtl::OUString( _pType->pTypeName );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/vcl vcl/source
include/vcl/bitmap.hxx |3 +-- vcl/source/bitmap/bitmap.cxx |3 --- 2 files changed, 1 insertion(+), 5 deletions(-) New commits: commit 6ccc85290ea66ac69a609ef2345aea48605cefba Author: Noel Grandin AuthorDate: Wed Jun 23 15:18:14 2021 +0200 Commit: Noel Grandin CommitDate: Thu Jun 24 21:32:52 2021 +0200 BmpScaleFlag::Super is dead ever since commit 2269ac65de127d33d41843ae15f6bece5bc778bc Author: Michael Meeks Date: Fri Nov 7 05:42:51 2014 + icontest: remove hand-coded opengl path. Change-Id: Ida030be0e087353e20897a9e961c9ce1134b21e7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117782 Tested-by: Jenkins Reviewed-by: Noel Grandin diff --git a/include/vcl/bitmap.hxx b/include/vcl/bitmap.hxx index f9e116c56d3b..2a6872c179f0 100644 --- a/include/vcl/bitmap.hxx +++ b/include/vcl/bitmap.hxx @@ -61,8 +61,7 @@ enum class BmpScaleFlag Interpolate, // fast, integer bilinear Lanczos, BiCubic, -BiLinear, -Super // bilinear interpolation when supersampling and averaging when subsampling under certain scale +BiLinear }; #define BMP_COL_TRANS Color( 252, 3, 251 ) diff --git a/vcl/source/bitmap/bitmap.cxx b/vcl/source/bitmap/bitmap.cxx index e093e0afabb5..1c50d35e649b 100644 --- a/vcl/source/bitmap/bitmap.cxx +++ b/vcl/source/bitmap/bitmap.cxx @@ -1435,9 +1435,6 @@ bool Bitmap::Scale( const double& rScaleX, const double& rScaleY, BmpScaleFlag n bRetval = BitmapFilter::Filter(aBmpEx, BitmapInterpolateScaleFilter(rScaleX, rScaleY)); break; -case BmpScaleFlag::Super: -bRetval = BitmapFilter::Filter(aBmpEx, BitmapScaleSuperFilter(rScaleX, rScaleY)); -break; case BmpScaleFlag::BestQuality: case BmpScaleFlag::Lanczos: bRetval = BitmapFilter::Filter(aBmpEx, vcl::BitmapScaleLanczos3Filter(rScaleX, rScaleY)); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/inc vcl/unx
vcl/inc/unx/gtk/gtkframe.hxx |6
vcl/inc/unx/gtk/gtkinst.hxx | 18 +-
vcl/unx/gtk3/gtkframe.cxx| 330 ---
vcl/unx/gtk3/gtkinst.cxx |9 -
4 files changed, 331 insertions(+), 32 deletions(-)
New commits:
commit 8c276412c9cd8e12d88f4349f5fba19651161886
Author: Caolán McNamara
AuthorDate: Mon Jun 21 20:50:06 2021 +0100
Commit: Caolán McNamara
CommitDate: Thu Jun 24 21:38:33 2021 +0200
gtk4: get dnd drop into LibreOffice from another app working
Change-Id: I9519af009b479e51a3da556f26f3950c4930d618
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117611
Tested-by: Caolán McNamara
Reviewed-by: Caolán McNamara
diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx
index 248b841dc07e..7d612f077d3f 100644
--- a/vcl/inc/unx/gtk/gtkframe.hxx
+++ b/vcl/inc/unx/gtk/gtkframe.hxx
@@ -260,7 +260,11 @@ class GtkSalFrame final : public SalFrame
static gboolean signalTooltipQuery(GtkWidget*, gint x, gint y,
gboolean keyboard_mode, GtkTooltip
*tooltip,
gpointer frame);
-#if !GTK_CHECK_VERSION(4, 0, 0)
+#if GTK_CHECK_VERSION(4, 0, 0)
+static GdkDragAction signalDragMotion(GtkDropTargetAsync *dest, GdkDrop
*drop, double x, double y, gpointer frame);
+static void signalDragLeave(GtkDropTargetAsync *dest, GdkDrop
*drop, gpointer frame);
+static gboolean signalDragDrop(GtkDropTargetAsync* context, GdkDrop*
drop, double x, double y, gpointer frame);
+#else
static gboolean signalDragMotion(GtkWidget *widget, GdkDragContext
*context, gint x, gint y,
guint time, gpointer frame);
static gboolean signalDragDrop(GtkWidget* widget, GdkDragContext
*context, gint x, gint y,
diff --git a/vcl/inc/unx/gtk/gtkinst.hxx b/vcl/inc/unx/gtk/gtkinst.hxx
index e13524d8c54e..141a2a209ab0 100644
--- a/vcl/inc/unx/gtk/gtkinst.hxx
+++ b/vcl/inc/unx/gtk/gtkinst.hxx
@@ -64,8 +64,11 @@ struct text_transfer_result
struct read_transfer_result
{
-css::uno::Sequence aSeq;
+enum { BlockSize = 8192 };
+size_t nRead = 0;
bool bDone = false;
+
+std::vector aVector;
};
#endif
@@ -131,9 +134,7 @@ class GtkInstDropTarget final : public
cppu::WeakComponentImplHelper>
m_aListeners;
public:
@@ -169,10 +170,17 @@ public:
}
#if !GTK_CHECK_VERSION(4, 0, 0)
-gboolean signalDragDrop(GtkWidget* pWidget, GdkDragContext* context, gint
x, gint y, guint time);
gboolean signalDragMotion(GtkWidget* pWidget, GdkDragContext* context,
gint x, gint y, guint time);
+gboolean signalDragDrop(GtkWidget* pWidget, GdkDragContext* context, gint
x, gint y, guint time);
+#else
+GdkDragAction signalDragMotion(GtkWidget *pWidget, GtkDropTargetAsync
*context, GdkDrop *drop, double x, double y);
+gboolean signalDragDrop(GtkDropTargetAsync *context, GdkDrop *drop, double
x, double y);
+#endif
+
+void signalDragLeave(GtkWidget* pWidget);
+
+#if !GTK_CHECK_VERSION(4, 0, 0)
void signalDragDropReceived(GtkWidget* pWidget, GdkDragContext* context,
gint x, gint y, GtkSelectionData* data, guint ttype, guint time);
-void signalDragLeave(GtkWidget* pWidget, GdkDragContext* context, guint
time);
#endif
};
diff --git a/vcl/unx/gtk3/gtkframe.cxx b/vcl/unx/gtk3/gtkframe.cxx
index b32eb14ad5e7..aab7f40fc603 100644
--- a/vcl/unx/gtk3/gtkframe.cxx
+++ b/vcl/unx/gtk3/gtkframe.cxx
@@ -975,17 +975,26 @@ void GtkSalFrame::InitCommon()
GtkEventController* pScrollController =
gtk_event_controller_scroll_new(GTK_EVENT_CONTROLLER_SCROLL_BOTH_AXES);
g_signal_connect(pScrollController, "scroll", G_CALLBACK(signalScroll),
this);
gtk_widget_add_controller(pEventWidget, pScrollController);
-
#endif
-#if !GTK_CHECK_VERSION(4,0,0)
+
//Drop Target Stuff
+#if GTK_CHECK_VERSION(4,0,0)
+GtkDropTargetAsync* pDropTarget = gtk_drop_target_async_new(nullptr,
GdkDragAction(GDK_ACTION_ALL));
+g_signal_connect(G_OBJECT(pDropTarget), "drag-enter",
G_CALLBACK(signalDragMotion), this);
+g_signal_connect(G_OBJECT(pDropTarget), "drag-motion",
G_CALLBACK(signalDragMotion), this);
+g_signal_connect(G_OBJECT(pDropTarget), "drag-leave",
G_CALLBACK(signalDragLeave), this);
+g_signal_connect(G_OBJECT(pDropTarget), "drop",
G_CALLBACK(signalDragDrop), this);
+gtk_widget_add_controller(pEventWidget, GTK_EVENT_CONTROLLER(pDropTarget));
+#else
gtk_drag_dest_set(GTK_WIDGET(pEventWidget), GtkDestDefaults(0), nullptr,
0, GdkDragAction(0));
gtk_drag_dest_set_track_motion(GTK_WIDGET(pEventWidget), true);
m_aMouseSignalIds.push_back(g_signal_connect( G_OBJECT(pEventWidget),
"drag-motion", G_CALLBACK(signalDragMotion), this ));
m_aMouseSignalIds.push_back(g_signal_connect( G_OBJECT(pEventWidget),
"drag-drop", G_CALLBACK(signalDragDrop), this ));
m_aMouseSignalIds.push_back(g_signal_connect( G_OBJECT(pEventWidge
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/gtk3/gtkframe.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit bf7c5127d3ff8d699f2b44e6c3011209cf7848e0
Author: Caolán McNamara
AuthorDate: Wed Jun 23 21:01:56 2021 +0100
Commit: Caolán McNamara
CommitDate: Thu Jun 24 21:39:12 2021 +0200
gtk4: unref stream when done with it
Change-Id: I3cb11918f0e85fcbc9557dc0211bc10f819f9064
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117749
Tested-by: Caolán McNamara
Reviewed-by: Caolán McNamara
diff --git a/vcl/unx/gtk3/gtkframe.cxx b/vcl/unx/gtk3/gtkframe.cxx
index aab7f40fc603..a500af13a0d4 100644
--- a/vcl/unx/gtk3/gtkframe.cxx
+++ b/vcl/unx/gtk3/gtkframe.cxx
@@ -4236,6 +4236,7 @@ void read_async_completed(GObject* source, GAsyncResult*
res, gpointer user_data
if (bFinished)
{
+g_object_unref(stream);
pRes->aVector.resize(pRes->nRead);
pRes->bDone = true;
g_main_context_wakeup(nullptr);
___
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/gtkframe.cxx | 35 +--
1 file changed, 1 insertion(+), 34 deletions(-)
New commits:
commit af77818e8a37eb53fa868250366a44327b63b406
Author: Caolán McNamara
AuthorDate: Thu Jun 24 08:45:07 2021 +0100
Commit: Caolán McNamara
CommitDate: Thu Jun 24 21:39:47 2021 +0200
gtk4: simplify dnd "drop" signal
Change-Id: I2d4714194516c6b8270fa96c8c5a6b75d2d10b86
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117760
Tested-by: Caolán McNamara
Reviewed-by: Caolán McNamara
diff --git a/vcl/unx/gtk3/gtkframe.cxx b/vcl/unx/gtk3/gtkframe.cxx
index a500af13a0d4..ffc934687344 100644
--- a/vcl/unx/gtk3/gtkframe.cxx
+++ b/vcl/unx/gtk3/gtkframe.cxx
@@ -4492,45 +4492,12 @@ GtkInstDragSource*
GtkInstDragSource::g_ActiveDragSource;
#if GTK_CHECK_VERSION(4, 0, 0)
-struct GrabBag
-{
-GtkInstDropTarget* m_pDropTarget;
-GtkDropTargetAsync* m_pContext;
-GdkDrop* m_pDrop;
-double m_nX;
-double m_nY;
-
-GrabBag(GtkInstDropTarget* pDropTarget,
-GtkDropTargetAsync* pContext,
-GdkDrop* pDrop,
-double nX,
-double nY)
-: m_pDropTarget(pDropTarget)
-, m_pContext(pContext)
-, m_pDrop(pDrop)
-, m_nX(nX)
-, m_nY(nY)
-{
-}
-};
-
-static gboolean lcl_deferred_dragDrop(gpointer user_data)
-{
-GrabBag* pGrabBag = static_cast(user_data);
-pGrabBag->m_pDropTarget->signalDragDrop(pGrabBag->m_pContext,
pGrabBag->m_pDrop, pGrabBag->m_nX, pGrabBag->m_nY);
-g_object_unref(pGrabBag->m_pDrop);
-return false;
-}
-
gboolean GtkSalFrame::signalDragDrop(GtkDropTargetAsync* context, GdkDrop*
drop, double x, double y, gpointer frame)
{
GtkSalFrame* pThis = static_cast(frame);
if (!pThis->m_pDropTarget)
return false;
-g_object_ref(drop);
-g_idle_add(lcl_deferred_dragDrop, new GrabBag(pThis->m_pDropTarget,
context, drop, x, y));
-//return pThis->m_pDropTarget->signalDragDrop(context, drop, x, y);
-return true;
+return pThis->m_pDropTarget->signalDragDrop(context, drop, x, y);
}
#else
gboolean GtkSalFrame::signalDragDrop(GtkWidget* pWidget, GdkDragContext*
context, gint x, gint y, guint time, gpointer frame)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/inc vcl/unx
vcl/inc/unx/gtk/gtkinst.hxx |2 +
vcl/unx/gtk3/gtkframe.cxx | 33 ---
vcl/unx/gtk3/gtkinst.cxx| 76 ++--
3 files changed, 56 insertions(+), 55 deletions(-)
New commits:
commit dcecb57d94fa1d4dc0b9f2449974936a40e6ba7d
Author: Caolán McNamara
AuthorDate: Thu Jun 24 09:00:04 2021 +0100
Commit: Caolán McNamara
CommitDate: Thu Jun 24 21:40:32 2021 +0200
gtk4: reuse read_block_async_completed from dnd for cnp
Change-Id: I1acfa4c48ee59fd79b4a4b32afa732feef6348c7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117761
Tested-by: Caolán McNamara
Reviewed-by: Caolán McNamara
diff --git a/vcl/inc/unx/gtk/gtkinst.hxx b/vcl/inc/unx/gtk/gtkinst.hxx
index 141a2a209ab0..d7580cf68b1e 100644
--- a/vcl/inc/unx/gtk/gtkinst.hxx
+++ b/vcl/inc/unx/gtk/gtkinst.hxx
@@ -69,6 +69,8 @@ struct read_transfer_result
bool bDone = false;
std::vector aVector;
+
+static void read_block_async_completed(GObject* source, GAsyncResult* res,
gpointer user_data);
};
#endif
diff --git a/vcl/unx/gtk3/gtkframe.cxx b/vcl/unx/gtk3/gtkframe.cxx
index ffc934687344..3f13023d76f4 100644
--- a/vcl/unx/gtk3/gtkframe.cxx
+++ b/vcl/unx/gtk3/gtkframe.cxx
@@ -4225,37 +4225,6 @@ namespace {
#if GTK_CHECK_VERSION(4, 0, 0)
-void read_async_completed(GObject* source, GAsyncResult* res, gpointer
user_data)
-{
-GInputStream* stream = G_INPUT_STREAM(source);
-read_transfer_result* pRes = static_cast(user_data);
-
-gsize bytes_read = g_input_stream_read_finish(stream, res, nullptr);
-
-bool bFinished = bytes_read == 0;
-
-if (bFinished)
-{
-g_object_unref(stream);
-pRes->aVector.resize(pRes->nRead);
-pRes->bDone = true;
-g_main_context_wakeup(nullptr);
-return;
-}
-
-pRes->nRead += bytes_read;
-
-pRes->aVector.resize(pRes->nRead + read_transfer_result::BlockSize);
-
-g_input_stream_read_async(stream,
- pRes->aVector.data() + pRes->nRead,
- read_transfer_result::BlockSize,
- G_PRIORITY_DEFAULT,
- nullptr,
- read_async_completed,
- user_data);
-}
-
void read_drop_async_completed(GObject* source, GAsyncResult* res, gpointer
user_data)
{
GdkDrop* drop = GDK_DROP(source);
@@ -4277,7 +4246,7 @@ void read_drop_async_completed(GObject* source,
GAsyncResult* res, gpointer user
pRes->aVector.size(),
G_PRIORITY_DEFAULT,
nullptr,
- read_async_completed,
+ read_transfer_result::read_block_async_completed,
user_data);
}
#endif
diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index 92df2f48d516..8fe127b32e79 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -665,6 +665,39 @@ sal_Bool SAL_CALL
GtkTransferable::isDataFlavorSupported(const css::datatransfer
return std::any_of(aAll.begin(), aAll.end(), DataFlavorEq(rFlavor));
}
+#if GTK_CHECK_VERSION(4, 0, 0)
+void read_transfer_result::read_block_async_completed(GObject* source,
GAsyncResult* res, gpointer user_data)
+{
+GInputStream* stream = G_INPUT_STREAM(source);
+read_transfer_result* pRes = static_cast(user_data);
+
+gsize bytes_read = g_input_stream_read_finish(stream, res, nullptr);
+
+bool bFinished = bytes_read == 0;
+
+if (bFinished)
+{
+g_object_unref(stream);
+pRes->aVector.resize(pRes->nRead);
+pRes->bDone = true;
+g_main_context_wakeup(nullptr);
+return;
+}
+
+pRes->nRead += bytes_read;
+
+pRes->aVector.resize(pRes->nRead + read_transfer_result::BlockSize);
+
+g_input_stream_read_async(stream,
+ pRes->aVector.data() + pRes->nRead,
+ read_transfer_result::BlockSize,
+ G_PRIORITY_DEFAULT,
+ nullptr,
+ read_block_async_completed,
+ user_data);
+}
+#endif
+
namespace {
GdkClipboard* clipboard_get(SelectionType eSelection)
@@ -694,35 +727,29 @@ void text_async_completed(GObject* source, GAsyncResult*
res, gpointer data)
g_main_context_wakeup(nullptr);
}
-void read_async_completed(GObject* source, GAsyncResult* res, gpointer data)
+void read_clipboard_async_completed(GObject* source, GAsyncResult* res,
gpointer user_data)
{
GdkClipboard* clipboard = GDK_CLIPBOARD(source);
-read_transfer_result* pRes = static_cast(data);
+read_transfer_result* pRes = static_cast(user_data);
-if (GInputStream* pResult = gdk_clipboard_read_finish(clipboard, res,
nullptr, nullptr))
-{
-const int nBlockSize = 8192;
-std::
[Libreoffice-commits] core.git: vcl/inc vcl/unx
vcl/inc/unx/gtk/gtkinst.hxx |6 ---
vcl/unx/gtk3/gtkinst.cxx| 80
2 files changed, 37 insertions(+), 49 deletions(-)
New commits:
commit c83a9ef419ac9bde61d0ebafa3692c8e43374d49
Author: Caolán McNamara
AuthorDate: Thu Jun 24 09:10:19 2021 +0100
Commit: Caolán McNamara
CommitDate: Thu Jun 24 21:41:03 2021 +0200
drop text_transfer_result and merge dnd and paste logic
Change-Id: Ia91e961d2d94bbd4baeb81647438a4026a4fce60
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117764
Tested-by: Caolán McNamara
Reviewed-by: Caolán McNamara
diff --git a/vcl/inc/unx/gtk/gtkinst.hxx b/vcl/inc/unx/gtk/gtkinst.hxx
index d7580cf68b1e..4c9eea3b8d48 100644
--- a/vcl/inc/unx/gtk/gtkinst.hxx
+++ b/vcl/inc/unx/gtk/gtkinst.hxx
@@ -56,12 +56,6 @@ class GtkSalFrame;
#if GTK_CHECK_VERSION(4, 0, 0)
gint gtk_dialog_run(GtkDialog *dialog);
-struct text_transfer_result
-{
-OUString sText;
-bool bDone = false;
-};
-
struct read_transfer_result
{
enum { BlockSize = 8192 };
diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index 8fe127b32e79..f3f739454e3b 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -713,20 +713,6 @@ GdkClipboard* clipboard_get(SelectionType eSelection)
#if GTK_CHECK_VERSION(4, 0, 0)
-void text_async_completed(GObject* source, GAsyncResult* res, gpointer data)
-{
-GdkClipboard* clipboard = GDK_CLIPBOARD(source);
-text_transfer_result* pRes = static_cast(data);
-
-gchar* pText = gdk_clipboard_read_text_finish(clipboard, res, nullptr);
-pRes->sText = OUString(pText, pText ? strlen(pText) : 0,
RTL_TEXTENCODING_UTF8);
-g_free(pText);
-
-pRes->bDone = true;
-
-g_main_context_wakeup(nullptr);
-}
-
void read_clipboard_async_completed(GObject* source, GAsyncResult* res,
gpointer user_data)
{
GdkClipboard* clipboard = GDK_CLIPBOARD(source);
@@ -772,31 +758,43 @@ public:
virtual css::uno::Any SAL_CALL getTransferData(const
css::datatransfer::DataFlavor& rFlavor) override
{
+css::datatransfer::DataFlavor aFlavor(rFlavor);
+if (aFlavor.MimeType == "text/plain;charset=utf-16")
+aFlavor.MimeType = "text/plain;charset=utf-8";
+
+auto it = m_aMimeTypeToGtkType.find(aFlavor.MimeType);
+if (it == m_aMimeTypeToGtkType.end())
+return css::uno::Any();
+
css::uno::Any aRet;
+
GdkClipboard* clipboard = clipboard_get(m_eSelection);
-if (rFlavor.MimeType == "text/plain;charset=utf-16")
-{
+
#if !GTK_CHECK_VERSION(4, 0, 0)
+if (aFlavor.MimeType == "text/plain;charset=utf-8")
+{
gchar *pText = gtk_clipboard_wait_for_text(clipboard);
OUString aStr(pText, pText ? strlen(pText) : 0,
RTL_TEXTENCODING_UTF8);
g_free(pText);
aRet <<= aStr.replaceAll("\r\n", "\n");
-#else
-SalInstance* pInstance = GetSalData()->m_pInstance;
-text_transfer_result aRes;
-gdk_clipboard_read_text_async(clipboard, nullptr,
text_async_completed, &aRes);
-while (!aRes.bDone)
-pInstance->DoYield(true, false);
-aRet <<= aRes.sText.replaceAll("\r\n", "\n");
-#endif
return aRet;
}
-
-auto it = m_aMimeTypeToGtkType.find(rFlavor.MimeType);
-if (it == m_aMimeTypeToGtkType.end())
-return css::uno::Any();
-
-#if GTK_CHECK_VERSION(4, 0, 0)
+else
+{
+GtkSelectionData* data = gtk_clipboard_wait_for_contents(clipboard,
+
it->second);
+if (!data)
+{
+return css::uno::Any();
+}
+gint length;
+const guchar *rawdata =
gtk_selection_data_get_data_with_length(data,
+
&length);
+Sequence aSeq(reinterpret_cast(rawdata), length);
+gtk_selection_data_free(data);
+aRet <<= aSeq;
+}
+#else
SalInstance* pInstance = GetSalData()->m_pInstance;
read_transfer_result aRes;
const char *mime_types[] = { it->second.getStr(), nullptr };
@@ -811,21 +809,17 @@ public:
while (!aRes.bDone)
pInstance->DoYield(true, false);
-Sequence aSeq(aRes.aVector.data(), aRes.aVector.size());
-aRet <<= aSeq;
-#else
-GtkSelectionData* data = gtk_clipboard_wait_for_contents(clipboard,
- it->second);
-if (!data)
+if (aFlavor.MimeType == "text/plain;charset=utf-8")
{
-return css::uno::Any();
+const char* pStr = reinterpret_cast(aRes.aVector.data());
+OUString aStr(pStr, aRes.aVector.size(), RTL_TEXTENCODING_UTF8);
+aRet <<= aStr.replaceAll("\r\n",
[Libreoffice-commits] core.git: vcl/inc vcl/unx
vcl/inc/unx/gtk/gtkinst.hxx |3 +++
vcl/unx/gtk3/gtkframe.cxx | 11 ++-
vcl/unx/gtk3/gtkinst.cxx| 22 +-
3 files changed, 18 insertions(+), 18 deletions(-)
New commits:
commit 1f8095ad5f073c14b9e604d02dda4435eb23fefa
Author: Caolán McNamara
AuthorDate: Thu Jun 24 09:19:16 2021 +0100
Commit: Caolán McNamara
CommitDate: Thu Jun 24 21:41:34 2021 +0200
gtk4: merge some common dnd and cnp blocks
Change-Id: I195eb7ae3fda492a36423f57139550cb7fef9b2b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117765
Tested-by: Caolán McNamara
Reviewed-by: Caolán McNamara
diff --git a/vcl/inc/unx/gtk/gtkinst.hxx b/vcl/inc/unx/gtk/gtkinst.hxx
index 4c9eea3b8d48..7203d4a0b131 100644
--- a/vcl/inc/unx/gtk/gtkinst.hxx
+++ b/vcl/inc/unx/gtk/gtkinst.hxx
@@ -65,6 +65,9 @@ struct read_transfer_result
std::vector aVector;
static void read_block_async_completed(GObject* source, GAsyncResult* res,
gpointer user_data);
+
+OUString get_as_string() const;
+css::uno::Sequence get_as_sequence() const;
};
#endif
diff --git a/vcl/unx/gtk3/gtkframe.cxx b/vcl/unx/gtk3/gtkframe.cxx
index 3f13023d76f4..529c39e7f0dc 100644
--- a/vcl/unx/gtk3/gtkframe.cxx
+++ b/vcl/unx/gtk3/gtkframe.cxx
@@ -4417,16 +4417,9 @@ public:
pInstance->DoYield(true, false);
if (aFlavor.MimeType == "text/plain;charset=utf-8")
-{
-const char* pStr = reinterpret_cast(aRes.aVector.data());
-OUString aStr(pStr, aRes.aVector.size(), RTL_TEXTENCODING_UTF8);
-aRet <<= aStr.replaceAll("\r\n", "\n");
-}
+aRet <<= aRes.get_as_string();
else
-{
-auto aSeq = css::uno::Sequence(aRes.aVector.data(),
aRes.aVector.size());
-aRet <<= aSeq;
-}
+aRet <<= aRes.get_as_sequence();
#endif
return aRet;
}
diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index f3f739454e3b..f062dc5c13a4 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -696,6 +696,17 @@ void
read_transfer_result::read_block_async_completed(GObject* source, GAsyncRes
read_block_async_completed,
user_data);
}
+
+OUString read_transfer_result::get_as_string() const
+{
+const char* pStr = reinterpret_cast(aVector.data());
+return OUString(pStr, aVector.size(),
RTL_TEXTENCODING_UTF8).replaceAll("\r\n", "\n");
+}
+
+css::uno::Sequence read_transfer_result::get_as_sequence() const
+{
+return css::uno::Sequence(aVector.data(), aVector.size());
+}
#endif
namespace {
@@ -810,16 +821,9 @@ public:
pInstance->DoYield(true, false);
if (aFlavor.MimeType == "text/plain;charset=utf-8")
-{
-const char* pStr = reinterpret_cast(aRes.aVector.data());
-OUString aStr(pStr, aRes.aVector.size(), RTL_TEXTENCODING_UTF8);
-aRet <<= aStr.replaceAll("\r\n", "\n");
-}
+aRet <<= aRes.get_as_string();
else
-{
-auto aSeq = css::uno::Sequence(aRes.aVector.data(),
aRes.aVector.size());
-aRet <<= aSeq;
-}
+aRet <<= aRes.get_as_sequence();
#endif
return aRet;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/inc vcl/unx
vcl/inc/unx/gtk/gtkinst.hxx |4 ++--
vcl/unx/gtk3/gtkframe.cxx | 28 ++--
vcl/unx/gtk3/gtkinst.cxx|4 ++--
3 files changed, 18 insertions(+), 18 deletions(-)
New commits:
commit a73ace0a50ac497de8d5a9559aafd7e77df6af8a
Author: Caolán McNamara
AuthorDate: Thu Jun 24 10:24:12 2021 +0100
Commit: Caolán McNamara
CommitDate: Thu Jun 24 21:42:09 2021 +0200
gtk[3|4] set what widget to highlight during dnd
Change-Id: Iba808b2f11615a25463c2739e6347f3cc2a91bc2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117770
Tested-by: Caolán McNamara
Reviewed-by: Caolán McNamara
diff --git a/vcl/inc/unx/gtk/gtkinst.hxx b/vcl/inc/unx/gtk/gtkinst.hxx
index 7203d4a0b131..56da7a6885f3 100644
--- a/vcl/inc/unx/gtk/gtkinst.hxx
+++ b/vcl/inc/unx/gtk/gtkinst.hxx
@@ -172,11 +172,11 @@ public:
gboolean signalDragMotion(GtkWidget* pWidget, GdkDragContext* context,
gint x, gint y, guint time);
gboolean signalDragDrop(GtkWidget* pWidget, GdkDragContext* context, gint
x, gint y, guint time);
#else
-GdkDragAction signalDragMotion(GtkWidget *pWidget, GtkDropTargetAsync
*context, GdkDrop *drop, double x, double y);
+GdkDragAction signalDragMotion(GtkDropTargetAsync *context, GdkDrop *drop,
double x, double y);
gboolean signalDragDrop(GtkDropTargetAsync *context, GdkDrop *drop, double
x, double y);
#endif
-void signalDragLeave(GtkWidget* pWidget);
+void signalDragLeave();
#if !GTK_CHECK_VERSION(4, 0, 0)
void signalDragDropReceived(GtkWidget* pWidget, GdkDragContext* context,
gint x, gint y, GtkSelectionData* data, guint ttype, guint time);
diff --git a/vcl/unx/gtk3/gtkframe.cxx b/vcl/unx/gtk3/gtkframe.cxx
index 529c39e7f0dc..4a4f5236a19e 100644
--- a/vcl/unx/gtk3/gtkframe.cxx
+++ b/vcl/unx/gtk3/gtkframe.cxx
@@ -4617,8 +4617,7 @@ GdkDragAction
GtkSalFrame::signalDragMotion(GtkDropTargetAsync *dest, GdkDrop *d
GtkSalFrame* pThis = static_cast(frame);
if (!pThis->m_pDropTarget)
return GdkDragAction(0);
-GtkWidget *pEventWidget = pThis->getMouseEventWidget();
-return pThis->m_pDropTarget->signalDragMotion(pEventWidget, dest, drop, x,
y);
+return pThis->m_pDropTarget->signalDragMotion(dest, drop, x, y);
}
#else
gboolean GtkSalFrame::signalDragMotion(GtkWidget *pWidget, GdkDragContext
*context, gint x, gint y, guint time, gpointer frame)
@@ -4633,15 +4632,16 @@ gboolean GtkSalFrame::signalDragMotion(GtkWidget
*pWidget, GdkDragContext *conte
#if !GTK_CHECK_VERSION(4,0,0)
gboolean GtkInstDropTarget::signalDragMotion(GtkWidget *pWidget,
GdkDragContext *context, gint x, gint y, guint time)
#else
-GdkDragAction GtkInstDropTarget::signalDragMotion(GtkWidget *pWidget,
GtkDropTargetAsync *context, GdkDrop *drop, double x, double y)
+GdkDragAction GtkInstDropTarget::signalDragMotion(GtkDropTargetAsync *context,
GdkDrop *pDrop, double x, double y)
#endif
{
if (!m_bInDrag)
{
+GtkWidget* pHighlightWidget =
GTK_WIDGET(m_pFrame->getFixedContainer());
#if !GTK_CHECK_VERSION(4,0,0)
-gtk_drag_highlight(pWidget);
+gtk_drag_highlight(pHighlightWidget);
#else
-gtk_widget_set_state_flags(pWidget, GTK_STATE_FLAG_DROP_ACTIVE, false);
+gtk_widget_set_state_flags(pHighlightWidget,
GTK_STATE_FLAG_DROP_ACTIVE, false);
#endif
}
@@ -4650,7 +4650,7 @@ GdkDragAction
GtkInstDropTarget::signalDragMotion(GtkWidget *pWidget, GtkDropTar
#if !GTK_CHECK_VERSION(4,0,0)
rtl::Reference pContext = new
GtkDropTargetDragContext(context, time);
#else
-rtl::Reference pContext = new
GtkDropTargetDragContext(context, drop);
+rtl::Reference pContext = new
GtkDropTargetDragContext(context, pDrop);
#endif
//preliminary accept the Drag and select the preferred action, the fire_*
will
//inform the original caller of our choice and the callsite can decide
@@ -4713,7 +4713,7 @@ GdkDragAction
GtkInstDropTarget::signalDragMotion(GtkWidget *pWidget, GtkDropTar
#if !GTK_CHECK_VERSION(4,0,0)
xTransferable = new GtkDnDTransferable(context, time, pWidget,
this);
#else
-xTransferable = new GtkDnDTransferable(drop);
+xTransferable = new GtkDnDTransferable(pDrop);
#endif
}
css::uno::Sequence aFormats =
xTransferable->getTransferDataFlavors();
@@ -4739,16 +4739,15 @@ void GtkSalFrame::signalDragLeave(GtkDropTargetAsync*
/*dest*/, GdkDrop* /*drop*
GtkSalFrame* pThis = static_cast(frame);
if (!pThis->m_pDropTarget)
return;
-GtkWidget *pEventWidget = pThis->getMouseEventWidget();
-pThis->m_pDropTarget->signalDragLeave(pEventWidget);
+pThis->m_pDropTarget->signalDragLeave();
}
#else
-void GtkSalFrame::signalDragLeave(GtkWidget *pWidget, GdkDragContext*
/*context*/, guint /*time*/, gpointer frame)
+void GtkSalFrame::signalDragLeave(GtkWidget*, GdkDragContext* /*context*/,
guint /*time*/, gpointer frame)
{
GtkSalFrame* pThis = static_cast(frame);
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/gtk3/gtkinst.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 31eed60da71f42fe232be1c4877056c0dc9f777a Author: Caolán McNamara AuthorDate: Thu Jun 24 10:31:26 2021 +0100 Commit: Caolán McNamara CommitDate: Thu Jun 24 21:42:40 2021 +0200 gtk4: unhighlight the parent like gtk3 Change-Id: I47a7a6f8e42d9032a9acfdda9376ef05e30e3e73 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117771 Tested-by: Caolán McNamara Reviewed-by: Caolán McNamara diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx index 5dc65ef79c3c..31c9528af0be 100644 --- a/vcl/unx/gtk3/gtkinst.cxx +++ b/vcl/unx/gtk3/gtkinst.cxx @@ -15044,7 +15044,7 @@ public: GtkWidget* pWidget = GTK_WIDGET(m_pTreeView); GtkWidget* pParent = gtk_widget_get_parent(pWidget); #if GTK_CHECK_VERSION(4, 0, 0) -gtk_widget_unset_state_flags(pWidget, GTK_STATE_FLAG_DROP_ACTIVE); +gtk_widget_unset_state_flags(pParent, GTK_STATE_FLAG_DROP_ACTIVE); #else gtk_drag_unhighlight(pParent); #endif ___ 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/gtkframe.cxx |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit 5536224038fc95369be7f9a7240ec12e3d0be5c3 Author: Caolán McNamara AuthorDate: Thu Jun 24 10:45:25 2021 +0100 Commit: Caolán McNamara CommitDate: Thu Jun 24 21:43:13 2021 +0200 gtk4: gdk_drop_get_actions is a better match Change-Id: I3442f3498f83da8d4eef3004b79925099dd1306d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117772 Tested-by: Jenkins Reviewed-by: Caolán McNamara diff --git a/vcl/unx/gtk3/gtkframe.cxx b/vcl/unx/gtk3/gtkframe.cxx index 4a4f5236a19e..80624112d9ec 100644 --- a/vcl/unx/gtk3/gtkframe.cxx +++ b/vcl/unx/gtk3/gtkframe.cxx @@ -4500,7 +4500,7 @@ gboolean GtkInstDropTarget::signalDragDrop(GtkDropTargetAsync* context, GdkDrop* #if !GTK_CHECK_VERSION(4, 0, 0) aEvent.DropAction = GdkToVcl(gdk_drag_context_get_selected_action(context)); #else -aEvent.DropAction = GdkToVcl(getPreferredDragAction(GdkToVcl(gtk_drop_target_async_get_actions(context; +aEvent.DropAction = GdkToVcl(getPreferredDragAction(GdkToVcl(gdk_drop_get_actions(drop; #endif // ACTION_DEFAULT is documented as... // 'This means the user did not press any key during the Drag and Drop operation @@ -4515,7 +4515,7 @@ gboolean GtkInstDropTarget::signalDragDrop(GtkDropTargetAsync* context, GdkDrop* GdkModifierType mask; gdk_window_get_pointer(widget_get_surface(pWidget), nullptr, nullptr, &mask); #else -aEvent.SourceActions = GdkToVcl(gtk_drop_target_async_get_actions(context)); +aEvent.SourceActions = GdkToVcl(gdk_drop_get_actions(drop)); GdkModifierType mask = gtk_event_controller_get_current_event_state(GTK_EVENT_CONTROLLER(context)); #endif if (!(mask & (GDK_CONTROL_MASK | GDK_SHIFT_MASK))) @@ -4660,7 +4660,7 @@ GdkDragAction GtkInstDropTarget::signalDragMotion(GtkDropTargetAsync *context, G GdkModifierType mask; gdk_window_get_pointer(widget_get_surface(pWidget), nullptr, nullptr, &mask); #else -sal_Int8 nSourceActions = GdkToVcl(gtk_drop_target_async_get_actions(context)); +sal_Int8 nSourceActions = GdkToVcl(gdk_drop_get_actions(pDrop)); GdkModifierType mask = gtk_event_controller_get_current_event_state(GTK_EVENT_CONTROLLER(context)); #endif ___ 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/gtkframe.cxx | 24 1 file changed, 12 insertions(+), 12 deletions(-) New commits: commit 344f8a96fda5880dfe812e3ae28cc943102d7779 Author: Caolán McNamara AuthorDate: Thu Jun 24 11:01:36 2021 +0100 Commit: Caolán McNamara CommitDate: Thu Jun 24 21:43:55 2021 +0200 gtk4: finish dnd target we want to work with a GdkDrop not GtkDropTargetAsync to get the behaviour we expect Change-Id: If1f0904fec3a0bfd6dfba770db6c11774e4d23a8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117774 Tested-by: Caolán McNamara Reviewed-by: Caolán McNamara diff --git a/vcl/unx/gtk3/gtkframe.cxx b/vcl/unx/gtk3/gtkframe.cxx index 80624112d9ec..89e3a3f59a83 100644 --- a/vcl/unx/gtk3/gtkframe.cxx +++ b/vcl/unx/gtk3/gtkframe.cxx @@ -4257,7 +4257,6 @@ class GtkDropTargetDropContext : public cppu::WeakImplHelper(0), m_nTime); #else -gtk_drop_target_async_reject_drop(m_pContext, m_pDrop); +gdk_drop_status(m_pDrop, gdk_drop_get_actions(m_pDrop), static_cast(0)); #endif } @@ -4493,7 +4491,7 @@ gboolean GtkInstDropTarget::signalDragDrop(GtkDropTargetAsync* context, GdkDrop* #if !GTK_CHECK_VERSION(4, 0, 0) aEvent.Context = new GtkDropTargetDropContext(context, time); #else -aEvent.Context = new GtkDropTargetDropContext(context, drop); +aEvent.Context = new GtkDropTargetDropContext(drop); #endif aEvent.LocationX = x; aEvent.LocationY = y; @@ -4549,7 +4547,6 @@ class GtkDropTargetDragContext : public cppu::WeakImplHelper(0), m_nTime); #else -gtk_drop_target_async_reject_drop(m_pContext, m_pDrop); +gdk_drop_status(m_pDrop, gdk_drop_get_actions(m_pDrop), static_cast(0)); #endif } }; @@ -4650,7 +4646,7 @@ GdkDragAction GtkInstDropTarget::signalDragMotion(GtkDropTargetAsync *context, G #if !GTK_CHECK_VERSION(4,0,0) rtl::Reference pContext = new GtkDropTargetDragContext(context, time); #else -rtl::Reference pContext = new GtkDropTargetDragContext(context, pDrop); +rtl::Reference pContext = new GtkDropTargetDragContext(pDrop); #endif //preliminary accept the Drag and select the preferred action, the fire_* will //inform the original caller of our choice and the callsite can decide @@ -4690,6 +4686,10 @@ GdkDragAction GtkInstDropTarget::signalDragMotion(GtkDropTargetAsync *context, G #if !GTK_CHECK_VERSION(4,0,0) gdk_drag_status(context, eAction, time); +#else +gdk_drop_status(pDrop, +static_cast(eAction | gdk_drop_get_actions(pDrop)), +eAction); #endif aEvent.Context = pContext; aEvent.LocationX = x; ___ 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/gtkframe.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 149f5e398c77b17c23941042c859264e322fbc2a Author: Caolán McNamara AuthorDate: Thu Jun 24 11:33:07 2021 +0100 Commit: Caolán McNamara CommitDate: Thu Jun 24 21:44:30 2021 +0200 gtk4: start with initial window state of all unset bits Change-Id: I36fd31253a61308b2cf84d48d3e963af6c49118f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117783 Tested-by: Caolán McNamara Reviewed-by: Caolán McNamara diff --git a/vcl/unx/gtk3/gtkframe.cxx b/vcl/unx/gtk3/gtkframe.cxx index 89e3a3f59a83..519837c75a4e 100644 --- a/vcl/unx/gtk3/gtkframe.cxx +++ b/vcl/unx/gtk3/gtkframe.cxx @@ -1074,7 +1074,7 @@ void GtkSalFrame::InitCommon() m_bFullscreen = false; m_bSpanMonitorsWhenFullscreen = false; #if GTK_CHECK_VERSION(4,0,0) -m_nState= GDK_TOPLEVEL_STATE_MAXIMIZED; +m_nState= static_cast(0); #else m_nState= GDK_WINDOW_STATE_WITHDRAWN; #endif ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/inc vcl/unx
vcl/inc/unx/gtk/gtkframe.hxx | 11 ++
vcl/unx/gtk3/gtkframe.cxx| 44 +++
2 files changed, 35 insertions(+), 20 deletions(-)
New commits:
commit ab25ca5f2fddf07a5790fc4a397ef758bbc31c62
Author: Caolán McNamara
AuthorDate: Thu Jun 24 12:39:00 2021 +0100
Commit: Caolán McNamara
CommitDate: Thu Jun 24 21:44:54 2021 +0200
gtk4: track underlying surface state for maximized/minimized
Change-Id: Ia62d12f367555b409cb2a6ed491f65dca34baed3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117784
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx
index 7d612f077d3f..57005e89a64e 100644
--- a/vcl/inc/unx/gtk/gtkframe.hxx
+++ b/vcl/inc/unx/gtk/gtkframe.hxx
@@ -306,10 +306,10 @@ class GtkSalFrame final : public SalFrame
bool DrawingAreaKey(SalEvent nEventType, guint keyval, guint keycode,
guint32 nTime, guint nState);
void DrawingAreaScroll(double delta_x, double delta_y, int nEventX, int
nEventY, guint32 nTime, guint nState);
#if GTK_CHECK_VERSION(4, 0, 0)
-static void signalMap( GtkWidget*, gpointer );
-static void signalUnmap( GtkWidget*, gpointer );
+static void signalMap(GtkWidget*, gpointer);
+static void signalUnmap(GtkWidget*, gpointer);
-static gboolean signalDelete( GtkWidget*, gpointer );
+static gboolean signalDelete(GtkWidget*, gpointer);
static void signalMotion(GtkEventControllerMotion *controller,
double x, double y, gpointer);
@@ -320,6 +320,8 @@ class GtkSalFrame final : public SalFrame
static gboolean signalKeyPressed(GtkEventControllerKey *controller,
guint keyval, guint keycode, GdkModifierType state, gpointer);
static gboolean signalKeyReleased(GtkEventControllerKey *controller,
guint keyval, guint keycode, GdkModifierType state, gpointer);
+
+static void signalWindowState(GdkToplevel*, GParamSpec*, gpointer);
#else
static gboolean signalMap( GtkWidget*, GdkEvent*, gpointer );
static gboolean signalUnmap( GtkWidget*, GdkEvent*, gpointer );
@@ -333,10 +335,11 @@ class GtkSalFrame final : public SalFrame
static gboolean signalCrossing( GtkWidget*, GdkEventCrossing*,
gpointer );
static gboolean signalKey( GtkWidget*, GdkEventKey*, gpointer );
+
+static gboolean signalWindowState( GtkWidget*, GdkEvent*, gpointer );
#endif
#if !GTK_CHECK_VERSION(4, 0, 0)
static gboolean signalConfigure( GtkWidget*, GdkEventConfigure*,
gpointer );
-static gboolean signalWindowState( GtkWidget*, GdkEvent*, gpointer );
#endif
static void signalDestroy( GtkWidget*, gpointer );
diff --git a/vcl/unx/gtk3/gtkframe.cxx b/vcl/unx/gtk3/gtkframe.cxx
index 519837c75a4e..02455ed0edb5 100644
--- a/vcl/unx/gtk3/gtkframe.cxx
+++ b/vcl/unx/gtk3/gtkframe.cxx
@@ -1055,8 +1055,8 @@ void GtkSalFrame::InitCommon()
#endif
#if !GTK_CHECK_VERSION(4,0,0)
g_signal_connect( G_OBJECT(m_pWindow), "configure-event",
G_CALLBACK(signalConfigure), this );
-g_signal_connect( G_OBJECT(m_pWindow), "window-state-event",
G_CALLBACK(signalWindowState), this );
#endif
+
#if !GTK_CHECK_VERSION(4,0,0)
g_signal_connect( G_OBJECT(m_pWindow), "key-press-event",
G_CALLBACK(signalKey), this );
g_signal_connect( G_OBJECT(m_pWindow), "key-release-event",
G_CALLBACK(signalKey), this );
@@ -1110,6 +1110,13 @@ void GtkSalFrame::InitCommon()
// realize the window, we need an XWindow id
gtk_widget_realize( m_pWindow );
+#if !GTK_CHECK_VERSION(4,0,0)
+g_signal_connect(G_OBJECT(m_pWindow), "window-state-event",
G_CALLBACK(signalWindowState), this);
+#else
+GdkSurface* gdkWindow = widget_get_surface(m_pWindow);
+g_signal_connect(G_OBJECT(gdkWindow), "notify::state",
G_CALLBACK(signalWindowState), this);
+#endif
+
//system data
m_aSystemData.SetWindowHandle(GetNativeWindowHandle(m_pWindow));
m_aSystemData.aShellWindow = reinterpret_cast(this);
@@ -4144,32 +4151,37 @@ gboolean GtkSalFrame::signalWindowState( GtkWidget*,
GdkEvent* pEvent, gpointer
pThis->m_aRestorePosSize = GetPosAndSize(GTK_WINDOW(pThis->m_pWindow));
}
-#if !GTK_CHECK_VERSION(4,0,0)
if ((pEvent->window_state.new_window_state & GDK_WINDOW_STATE_WITHDRAWN) &&
!(pThis->m_nState & GDK_WINDOW_STATE_WITHDRAWN))
{
if (pThis->isFloatGrabWindow())
pThis->closePopup();
}
-#endif
pThis->m_nState = pEvent->window_state.new_window_state;
-#if OSL_DEBUG_LEVEL > 1
-SAL_INFO_IF((pEvent->window_state.changed_mask &
-GDK_WINDOW_STATE_FULLSCREEN),
-"vcl.gtk3", "window "
-<< pThis
-<< " "
-<< ((pEvent->window_state.new_window_state &
-GDK_WINDOW_STATE_FULLSCREEN) ?
-"enters" :
-"leaves")
-
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/docxattributeoutput.cxx |4 ++-- sw/source/filter/ww8/ww8atr.cxx | 12 sw/source/filter/ww8/ww8par3.cxx |2 +- sw/source/filter/ww8/ww8par5.cxx |3 +++ 4 files changed, 18 insertions(+), 3 deletions(-) New commits: commit 4493f2191d95a35f8a29cd16912a1378d3c21ced Author: Justin Luth AuthorDate: Thu Jun 24 14:37:26 2021 +0200 Commit: Justin Luth CommitDate: Thu Jun 24 21:47:03 2021 +0200 tdf#120629 ms formats: better exporting of hindiVowels etc. The big problem was that hindiVowels was imported as CHARS_NEPALI, but CHARS_NEPALI was not exported in DOCX. Another easy win was to DOC export both LO forms of russianLower and both forms of russianUpper - just like DOCX. The page number field only allows a subset of formats. LO doesn't have support for Hex or DollarText formats. The Ordinal/Cardinal formats were an easy win for export, even though they don't import. [Import seems to be in ww8par5.cxx's GetNumTypeFromName(), except that is being passed an empty string.] Change-Id: I176a70e0e05967414337c17d8b4acc87e20ead73 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117793 Tested-by: Jenkins Reviewed-by: Justin Luth diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index 7cbf2a8a0df0..7d185f5ce9c0 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -6938,7 +6938,8 @@ static OString lcl_ConvertNumberingType(sal_Int16 nNumberingType, const SfxItemS case style::NumberingType::CHARS_ARABIC: aType="arabicAlpha"; break; case style::NumberingType::CHARS_ARABIC_ABJAD: aType="arabicAbjad"; break; case style::NumberingType::CHARS_THAI: aType="thaiLetters"; break; -case style::NumberingType::CHARS_PERSIAN: aType="hindiVowels"; break; +case style::NumberingType::CHARS_PERSIAN: +case style::NumberingType::CHARS_NEPALI: aType="hindiVowels"; break; case style::NumberingType::CHARS_CYRILLIC_UPPER_LETTER_RU: case style::NumberingType::CHARS_CYRILLIC_UPPER_LETTER_N_RU: aType = "russianUpper"; break; case style::NumberingType::CHARS_CYRILLIC_LOWER_LETTER_RU: @@ -6969,7 +6970,6 @@ static OString lcl_ConvertNumberingType(sal_Int16 nNumberingType, const SfxItemS case style::NumberingType::CHARS_GREEK_LOWER_LETTER: case style::NumberingType::PAGE_DESCRIPTOR: case style::NumberingType::TRANSLITERATION: -case style::NumberingType::CHARS_NEPALI: case style::NumberingType::CHARS_KHMER: case style::NumberingType::CHARS_LAO: case style::NumberingType::CHARS_TIBETAN: diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx index 7a942ddf8e80..437c1d058080 100644 --- a/sw/source/filter/ww8/ww8atr.cxx +++ b/sw/source/filter/ww8/ww8atr.cxx @@ -762,9 +762,12 @@ sal_uInt8 WW8Export::GetNumId( sal_uInt16 eNumType ) case style::NumberingType::CHARS_ARABIC: nRet = 46; break; case style::NumberingType::CHARS_HEBREW: nRet = 47; break; case style::NumberingType::CHARS_ARABIC_ABJAD: nRet = 48; break; +case style::NumberingType::CHARS_PERSIAN: case style::NumberingType::CHARS_NEPALI: nRet = 49; break; case style::NumberingType::CHARS_THAI: nRet = 53; break; +case style::NumberingType::CHARS_CYRILLIC_LOWER_LETTER_N_RU: case style::NumberingType::CHARS_CYRILLIC_LOWER_LETTER_RU: nRet = 58; break; +case style::NumberingType::CHARS_CYRILLIC_UPPER_LETTER_N_RU: case style::NumberingType::CHARS_CYRILLIC_UPPER_LETTER_RU: nRet = 59; break; // nothing, WW does the same (undocumented) case SVX_NUM_NUMBER_NONE: nRet = 0xff;break; @@ -2632,6 +2635,15 @@ void AttributeOutputBase::GetNumberPara( OUString& rStr, const SwField& rField ) case SVX_NUM_ROMAN_LOWER: rStr += "\\* roman "; break; +case SVX_NUM_TEXT_NUMBER: +rStr += "\\* Ordinal "; +break; +case SVX_NUM_TEXT_ORDINAL: +rStr += "\\* Ordtext "; +break; +case SVX_NUM_TEXT_CARDINAL: +rStr += "\\* Cardtext "; +break; default: OSL_ENSURE(rField.GetFormat() == SVX_NUM_ARABIC, "Unknown numbering type exported as default of Arabic"); diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx index 2a74217891c7..71864ead9beb 100644 --- a/sw/source/filter/ww8/ww8par3.cxx +++ b/sw/source/filter/ww8/ww8par3.cxx @@ -641,7 +641,7 @@ SvxNumType WW8ListManager::GetSvxNumTypeFromMSONFC(sal_uInt16 nNFC) nType = SVX_NUM_CHARS_ARABIC_ABJAD; break; case 49: // hindiVowels -nType = SVX_NUM_CHARS_NEPALI; // DOCX imports as NEPAL and exports as PERSIAN +nTyp
[Libreoffice-commits] core.git: sc/Module_sc.mk sc/qa sc/UITest_csv_dialog.mk
sc/Module_sc.mk |1 + sc/UITest_csv_dialog.mk | 20 2 files changed, 21 insertions(+) New commits: commit 66617557476e7275fdb5ef3a7f46df89027cda4e Author: Xisco Fauli AuthorDate: Thu Jun 24 12:29:20 2021 +0200 Commit: Xisco Fauli CommitDate: Thu Jun 24 21:51:46 2021 +0200 uitest: sc: move csv dialog tests to their own module Change-Id: Ib8456cb77b1c147856f378eb6198f69d380e18c5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117775 Tested-by: Jenkins Reviewed-by: Xisco Fauli diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk index a75da398136f..23f87316b79c 100644 --- a/sc/Module_sc.mk +++ b/sc/Module_sc.mk @@ -249,6 +249,7 @@ $(eval $(call gb_Module_add_uicheck_targets,sc,\ UITest_calc_tests3 \ UITest_calc_tests4 \ UITest_calc_tests6 \ + UITest_csv_dialog \ UITest_statistics \ UITest_solver \ UITest_goalSeek \ diff --git a/sc/UITest_csv_dialog.mk b/sc/UITest_csv_dialog.mk new file mode 100644 index ..9e1ac6ab9d08 --- /dev/null +++ b/sc/UITest_csv_dialog.mk @@ -0,0 +1,20 @@ +# -*- 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_UITest_UITest,csv_dialog)) + +$(eval $(call gb_UITest_add_modules,csv_dialog,$(SRCDIR)/sc/qa/uitest,\ + csv_dialog/ \ +)) + +$(eval $(call gb_UITest_set_defs,csv_dialog, \ +TDOC="$(SRCDIR)/sc/qa/uitest/data" \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/sc/qa/uitest/calc_tests9/tdf142395.py b/sc/qa/uitest/csv_dialog/tdf142395.py similarity index 100% rename from sc/qa/uitest/calc_tests9/tdf142395.py rename to sc/qa/uitest/csv_dialog/tdf142395.py diff --git a/sc/qa/uitest/calc_tests9/tdf57841.py b/sc/qa/uitest/csv_dialog/tdf57841.py similarity index 100% rename from sc/qa/uitest/calc_tests9/tdf57841.py rename to sc/qa/uitest/csv_dialog/tdf57841.py diff --git a/sc/qa/uitest/calc_tests9/tdf60468.py b/sc/qa/uitest/csv_dialog/tdf60468.py similarity index 100% rename from sc/qa/uitest/calc_tests9/tdf60468.py rename to sc/qa/uitest/csv_dialog/tdf60468.py ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/headless
vcl/headless/svpinst.cxx |1 -
1 file changed, 1 deletion(-)
New commits:
commit 4abd2598f7816891af3bd462ffaee57f3423b9f9
Author: Jan-Marek Glogowski
AuthorDate: Thu Jun 24 18:09:15 2021 +0200
Commit: Xisco Fauli
CommitDate: Thu Jun 24 23:19:45 2021 +0200
Revert: svp: always release SolarMutex on yield
Keeps the SolarMutexReleaser replacement. Seems a real fix for
the original busy-lock problem needs further investigation.
This reverts commit b9ea3467383ccdfe4be842e61267256f281487ee.
Change-Id: I4bf6157e7236c30ecbf0b710d8bf9dc39d9ae5dd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117795
Tested-by: Eike Rathke
Tested-by: Xisco Fauli
Tested-by: Jenkins
Reviewed-by: Xisco Fauli
diff --git a/vcl/headless/svpinst.cxx b/vcl/headless/svpinst.cxx
index 36859e9b3fb2..638052611360 100644
--- a/vcl/headless/svpinst.cxx
+++ b/vcl/headless/svpinst.cxx
@@ -528,7 +528,6 @@ bool SvpSalInstance::DoYield(bool bWait, bool
bHandleAllCurrentEvents)
{
if (bSkipPoll)
pMutex->m_NonMainWaitingYieldCond.set(); // wake up other
threads
-SolarMutexReleaser aReleaser;
}
}
else // !IsMainThread()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: configure.ac helpcompiler/Module_helpcompiler.mk solenv/gbuild
configure.ac |8 +++-
helpcompiler/Module_helpcompiler.mk|5 -
solenv/gbuild/Helper.mk|6 --
solenv/gbuild/extensions/pre_BuildTools.mk |4 ++--
4 files changed, 13 insertions(+), 10 deletions(-)
New commits:
commit 709a40e86734a4cbf67b65222e79db76aae56981
Author: Jan-Marek Glogowski
AuthorDate: Thu Jun 24 05:32:13 2021 +0200
Commit: Jan-Marek Glogowski
CommitDate: Thu Jun 24 23:25:28 2021 +0200
cross-toolset: fix real cross help building
Regression from commit 14069d84174ca7a4e60db4d75912903e9679b643
("configure: Improve help-options handling").
We now must forward the help and extension configure options, as
this is needed by the cross toolset to know, if it needs to build
the HelpIndexer and HelpLinker executables.
Also get rid of gb_Helper_optional_for_host. While it's in theory
more correct, it makes gb_Helper_optional more complex, so we now
rely on the fact, that the config_build.mk BUILD_TYPE is a subset
of the config_host.mk BUILD_TYPE.
This should fix the Windows Arm64 build, which currently seem to
be the only cross-build including help.
Change-Id: I8b90923c891b43cd2655b2578015c9bd579aae7d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117758
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski
diff --git a/configure.ac b/configure.ac
index 7ab1d3c802cd..f2053c85f503 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5346,8 +5346,12 @@ else
AC_MSG_RESULT([no])
fi
+AC_MSG_CHECKING([if we need to build the help index tooling])
if test "$with_help" = yes -o "$enable_extension_integration" != no; then
BUILD_TYPE="$BUILD_TYPE HELPTOOLS"
+AC_MSG_RESULT([yes])
+else
+AC_MSG_RESULT([no])
fi
AC_MSG_CHECKING([whether to enable xapian-omega support for online help])
@@ -5475,6 +5479,8 @@ if test "$cross_compiling" = "yes"; then
test -n "$TARFILE_LOCATION" && sub_conf_opts="$sub_conf_opts
--with-external-tar=$TARFILE_LOCATION"
test "$with_system_icu_for_build" = "yes" -o "$with_system_icu_for_build"
= "force" && sub_conf_opts="$sub_conf_opts --with-system-icu"
test "$with_galleries" = "no" -o -z "$WITH_GALLERY_BUILD" &&
sub_conf_opts="$sub_conf_opts --with-galleries=no
--disable-database-connectivity"
+test -n "$with_help" -a "$with_help" != "no" &&
sub_conf_opts="$sub_conf_opts --with-help=$with_help"
+test "$enable_extensions" = yes || sub_conf_opts="$sub_conf_opts
--disable-extensions"
test "$enable_wasm_strip" = "yes" && sub_conf_opts="$sub_conf_opts
--enable-wasm-strip"
sub_conf_opts="$sub_conf_opts $with_build_platform_configure_options"
@@ -5483,7 +5489,6 @@ if test "$cross_compiling" = "yes"; then
--build="$build_alias" \
--disable-cairo-canvas \
--disable-cups \
---disable-extensions \
--disable-firebird-sdbc \
--disable-gpgmepp \
--disable-gstreamer-1-0 \
@@ -5524,6 +5529,7 @@ if test "$cross_compiling" = "yes"; then
GLM
GRAPHITE
HARFBUZZ
+HELPTOOLS
ICU
LCMS2
LIBJPEG_TURBO
diff --git a/helpcompiler/Module_helpcompiler.mk
b/helpcompiler/Module_helpcompiler.mk
index ce2bd10fda51..146e3868df3f 100644
--- a/helpcompiler/Module_helpcompiler.mk
+++ b/helpcompiler/Module_helpcompiler.mk
@@ -10,11 +10,14 @@
$(eval $(call gb_Module_Module,helpcompiler))
$(eval $(call gb_Module_add_targets,helpcompiler,\
+Library_helplinker \
+))
+
+$(eval $(call gb_Module_add_targets_for_build,helpcompiler,\
$(call gb_Helper_optional,HELPTOOLS, \
Executable_HelpIndexer \
Executable_HelpLinker \
) \
-Library_helplinker \
))
# vim:set noet sw=4 ts=4:
diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk
index c7f2404efabd..4d2fdd698005 100644
--- a/solenv/gbuild/Helper.mk
+++ b/solenv/gbuild/Helper.mk
@@ -328,12 +328,6 @@ $(if $(filter $(1) $(1)_%,$(WITH_LOCALES)),$(2))
endef
endif
-define gb_Helper_optional_for_host
-$(if $(filter build,$(gb_Side)), \
- $(if $(filter $(1),$(BUILD_TYPE_FOR_HOST)),$(2)), \
- $(call gb_Output_error,gb_Helper_optional_for_host: Use only when
gb_Side=build))
-endef
-
define gb_Helper_print_on_error
$(if $(gb_QUIET_EXTERNAL), \
$(if $(2), \
diff --git a/solenv/gbuild/extensions/pre_BuildTools.mk
b/solenv/gbuild/extensions/pre_BuildTools.mk
index 390e391285db..e08906068d24 100644
--- a/solenv/gbuild/extensions/pre_BuildTools.mk
+++ b/solenv/gbuild/extensions/pre_BuildTools.mk
@@ -33,11 +33,11 @@ gb_BUILD_TOOLS_executables = \
unoidl-check \
unoidl-write \
xrmex \
-$(call gb_Helper_optional_for_host,HELPTOOLS, \
+$(call gb_Helper_optional,HELPTOOLS, \
HelpIndexer \
HelpLinker \
) \
-$(if $(filter WNT,$(OS)),$(call
gb_Helper_optional_for_host,DESKTOP,lngconvex))
[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - sw/source
sw/source/uibase/utlui/content.cxx |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 32cf12bf941975f7a040420f797ff6969caaf2d9 Author: Jim Raykowski AuthorDate: Tue Jun 22 21:29:22 2021 -0800 Commit: Xisco Fauli CommitDate: Fri Jun 25 00:38:00 2021 +0200 tdf#46626 Don't include footnote numbers in Navigator headings Change-Id: I8c655c6ed1e1d05407dac27ef19f26c6ca8d8d54 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117692 Tested-by: Jenkins Reviewed-by: Jim Raykowski (cherry picked from commit f446a203fa2897bab8ae7686c948a8bf060675c6) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117730 Reviewed-by: Xisco Fauli diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx index f7b6adc04eb8..3fdfb0b01e2d 100644 --- a/sw/source/uibase/utlui/content.cxx +++ b/sw/source/uibase/utlui/content.cxx @@ -630,7 +630,8 @@ void SwContentType::FillMemberList(bool* pbLevelOrVisibilityChanged) continue; // don't hide it, just skip it } OUString aEntry(comphelper::string::stripStart( - m_pWrtShell->getIDocumentOutlineNodesAccess()->getOutlineText(i, m_pWrtShell->GetLayout()), ' ')); + m_pWrtShell->getIDocumentOutlineNodesAccess()->getOutlineText( +i, m_pWrtShell->GetLayout(), true, false, false), ' ')); aEntry = SwNavigationPI::CleanEntry(aEntry); std::unique_ptr pCnt(new SwOutlineContent(this, aEntry, i, nLevel, m_pWrtShell->IsOutlineMovable( i ), nPos )); ___ 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/filter/ww8/ww8par3.cxx | 17 +
1 file changed, 5 insertions(+), 12 deletions(-)
New commits:
commit cd09753cb04a0649dfa9d3cb73ad7514af2d03bd
Author: Justin Luth
AuthorDate: Tue Apr 20 12:06:07 2021 +0200
Commit: Justin Luth
CommitDate: Fri Jun 25 06:00:18 2021 +0200
NFC: cleanup unnecessary variables, reduce scope.
This function look a LOT different
way back at original import,
and some of the refactoring since then
left things a bit messy.
The impetus for changing this was to see how m_nListLevel
was being used, and having it assigned to a temporary
const variable for no reason was annoying.
Change-Id: Ia25397dbe4bce2fd7bdfbb1b3053bd271c08212a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114404
Tested-by: Jenkins
Reviewed-by: Justin Luth
diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx
index 71864ead9beb..80bfebd68a61 100644
--- a/sw/source/filter/ww8/ww8par3.cxx
+++ b/sw/source/filter/ww8/ww8par3.cxx
@@ -1766,17 +1766,11 @@ void
SwWW8ImplReader::RegisterNumFormatOnStyle(sal_uInt16 nStyle)
rStyleInf.maWordLR.reset(ItemGet(*rStyleInf.m_pFormat,
RES_LR_SPACE).Clone());
// Phase 2: refresh StyleDef after reading all Lists
-SwNumRule* pNmRule = nullptr;
-const sal_uInt16 nLFO = rStyleInf.m_nLFOIndex;
-const sal_uInt8 nLevel = rStyleInf.m_nListLevel;
-if (
- (USHRT_MAX > nLFO) &&
- (WW8ListManager::nMaxLevel > nLevel)
- )
+if (rStyleInf.m_nLFOIndex < USHRT_MAX && rStyleInf.m_nListLevel <
WW8ListManager::nMaxLevel)
{
std::vector aParaSprms;
-pNmRule = m_xLstManager->GetNumRuleForActivation(nLFO, nLevel,
-aParaSprms);
+SwNumRule* pNmRule = m_xLstManager->GetNumRuleForActivation(
+rStyleInf.m_nLFOIndex, rStyleInf.m_nListLevel, aParaSprms);
if (pNmRule != nullptr)
{
@@ -1791,11 +1785,10 @@ void
SwWW8ImplReader::RegisterNumFormatOnStyle(sal_uInt16 nStyle)
SwNumRuleItem(pNmRule->GetName()));
rStyleInf.m_bHasStyNumRule = true;
}
+
+SetStyleIndent(rStyleInf, pNmRule->Get(rStyleInf.m_nListLevel));
}
}
-
-if (pNmRule)
-SetStyleIndent(rStyleInf, pNmRule->Get(nLevel));
}
void SwWW8ImplReader::RegisterNumFormatOnTextNode(sal_uInt16 nCurrentLFO,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Harshita Nag License Statement
All of my past & future contributions to LibreOffice may be licensed under the MPLv2/LGPLv3+ dual license. Best, Harshita ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
