[Libreoffice-commits] core.git: sal/osl
sal/osl/unx/socket.cxx | 74 -
1 file changed, 74 deletions(-)
New commits:
commit e9da22d3308557640e0edc45f72b1897f016d19b
Author: Stephan Bergmann
AuthorDate: Thu May 20 21:18:08 2021 +0200
Commit: Stephan Bergmann
CommitDate: Fri May 21 08:04:56 2021 +0200
Lets assume general availability of POSIX poll.h
...which should have been first released in SuS Issue 4, Version 2 in 1995.
If there should still be any relevant platforms that provide the
functionality
only in a non-standard header, please add back the relevant #if'ery.
Change-Id: I0f55341d24b905161ec38ed0d52602c6b6dfac46
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115888
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/sal/osl/unx/socket.cxx b/sal/osl/unx/socket.cxx
index 0c93e2928500..2eafd39394cb 100644
--- a/sal/osl/unx/socket.cxx
+++ b/sal/osl/unx/socket.cxx
@@ -38,27 +38,7 @@
#include "unixerrnostring.hxx"
#include
-/* defines for poll */
-#ifdef HAVE_POLL_H
-#undef HAVE_POLL_H
-#endif
-
-#if defined(LINUX) || defined(NETBSD) || defined ( FREEBSD ) || \
-defined (MACOSX) || defined (OPENBSD) || defined(DRAGONFLY)
-#include
-#define HAVE_POLL_H
-#endif /* HAVE_POLL_H */
-
-#if defined(__sun)
#include
-#define HAVE_POLL_H
-#endif /* __sun */
-
-#ifndef HAVE_POLL_H
-#define POLLIN 0x0001
-#define POLLOUT 0x0002
-#define POLLPRI 0x0004
-#endif /* HAVE_POLL_H */
/* defines for shutdown */
#define SD_RECEIVE 0
@@ -1787,8 +1767,6 @@ sal_Int32 SAL_CALL osl_writeSocket(
return BytesSend;
}
-#ifdef HAVE_POLL_H /* poll() */
-
static bool socket_poll (
oslSocketpSocket,
const TimeValue* pTimeout,
@@ -1833,58 +1811,6 @@ static bool socket_poll (
return ((fds.revents & nEvent) == nEvent);
}
-#else /* select() */
-
-static sal_Bool socket_poll (
-oslSocketpSocket,
-const TimeValue* pTimeout,
-shortnEvent)
-{
-fd_set fds;
-struct timeval tv;
-intresult;
-
-SAL_WARN_IF( !pSocket, "sal.osl", "undefined socket" );
-if (0 == pSocket)
- return sal_False; /* EINVAL */
-
-pSocket->m_nLastError = 0;
-
-FD_ZERO(&fds);
-FD_SET(pSocket->m_Socket, &fds);
-
-if (pTimeout)
-{
-/* Convert to 'timeval' */
-tv.tv_sec = pTimeout->Seconds;
-tv.tv_usec = pTimeout->Nanosec / 1000;
-}
-
-result = select (
-pSocket->m_Socket + 1,
-(nEvent == POLLIN ) ? PTR_FD_SET(fds) : NULL,
-(nEvent == POLLOUT) ? PTR_FD_SET(fds) : NULL,
-(nEvent == POLLPRI) ? PTR_FD_SET(fds) : NULL,
-(pTimeout) ? &tv : NULL);
-
-if (result < 0)
-{
-pSocket->m_nLastError = errno;
-int nErrno = errno;
-SAL_WARN( "sal.osl", "select failed: " << UnixErrnoString(nErrno) );
-return sal_False;
-}
-if (result == 0)
-{
-/* Timeout */
-return sal_False;
-}
-
-return (FD_ISSET(pSocket->m_Socket, &fds) ? sal_True : sal_False);
-}
-
-#endif /* HAVE_POLL_H */
-
sal_Bool SAL_CALL osl_isReceiveReady (
oslSocket pSocket, const TimeValue* pTimeout)
{
___
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/layout/data/tdf104254.docx |binary
sw/qa/extras/layout/layout2.cxx | 18 ++
sw/source/core/text/txtfly.cxx |8 +---
3 files changed, 23 insertions(+), 3 deletions(-)
New commits:
commit 798b69087119c01a3b51e0bb3240ef35cfededeb
Author: Daniel Arato (NISZ)
AuthorDate: Wed Mar 24 20:18:16 2021 +0100
Commit: László Németh
CommitDate: Fri May 21 08:00:33 2021 +0200
tdf#104254 sw DOCX import: fix text wrapping in headers
Text wrapping around shapes and images used to be
turned off in header and footer frames. This commit
simply reenables that feature for headers/footers
(to avoid also regressions related to the fix i13832).
Change-Id: I46ca112f36e0c0c86342fa34fdb7cb7502745731
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113098
Tested-by: László Németh
Reviewed-by: László Németh
diff --git a/sw/qa/extras/layout/data/tdf104254.docx
b/sw/qa/extras/layout/data/tdf104254.docx
new file mode 100644
index ..a074db337024
Binary files /dev/null and b/sw/qa/extras/layout/data/tdf104254.docx differ
diff --git a/sw/qa/extras/layout/layout2.cxx b/sw/qa/extras/layout/layout2.cxx
index 8846ff6a914e..7e962c9b5976 100644
--- a/sw/qa/extras/layout/layout2.cxx
+++ b/sw/qa/extras/layout/layout2.cxx
@@ -2472,6 +2472,24 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter2, testTdf124770)
assertXPath(pXmlDoc, "/root/page/body/txt[1]/LineBreak", 1);
}
+CPPUNIT_TEST_FIXTURE(SwLayoutWriter2, testTextWrappingInHeader)
+{
+SwDoc* pDoc = createDoc("tdf104254.docx");
+
+std::shared_ptr xMetaFile =
pDoc->GetDocShell()->GetPreviewMetaFile();
+MetafileXmlDump dumper;
+xmlDocUniquePtr pXmlDoc = dumpAndParse(dumper, *xMetaFile);
+CPPUNIT_ASSERT(pXmlDoc);
+assertXPath(pXmlDoc, "/metafile/push[1]/push[1]/push[1]/textarray", 2);
+
+// Make sure the header image does not block any of the header text.
+// Without the accompanying fix in place, this test would have failed with:
+// - Expected: > 3000
+// - Actual : 2009
+OUString sTextArrayX = getXPath(pXmlDoc,
"/metafile/push[1]/push[1]/push[1]/textarray[1]", "x");
+CPPUNIT_ASSERT(sTextArrayX.toUInt32() > 3000);
+}
+
CPPUNIT_TEST_FIXTURE(SwLayoutWriter2, testContinuousEndnotesInsertPageAtStart)
{
// Create a new document with CONTINUOUS_ENDNOTES enabled.
diff --git a/sw/source/core/text/txtfly.cxx b/sw/source/core/text/txtfly.cxx
index a5fb1f6b6731..28ffea4116ab 100644
--- a/sw/source/core/text/txtfly.cxx
+++ b/sw/source/core/text/txtfly.cxx
@@ -843,7 +843,8 @@ SwAnchoredObjList* SwTextFly::InitAnchoredObjList()
const bool bAllowCompatWrap = m_pCurrFrame->IsInTab() && (bFooterHeader ||
m_pCurrFrame->IsInFootnote());
const bool bWrapAllowed = (
pIDSA->get(DocumentSettingId::USE_FORMER_TEXT_WRAPPING) ||
bAllowCompatWrap ||
-(!m_pCurrFrame->IsInFootnote() &&
!bFooterHeader));
+(!m_pCurrFrame->IsInFootnote() &&
!bFooterHeader) ||
+bFooterHeader );
m_bOn = false;
@@ -885,12 +886,14 @@ SwAnchoredObjList* SwTextFly::InitAnchoredObjList()
// #i20505# Do not consider oversized objects
SwAnchoredObject* pAnchoredObj = (*pSorted)[ i ];
assert(pAnchoredObj);
+const SwFormatSurround &rFlyFormat =
pAnchoredObj->GetFrameFormat().GetSurround();
if ( !pAnchoredObj ||
!rIDDMA.IsVisibleLayerId(
pAnchoredObj->GetDrawObj()->GetLayer() ) ||
!pAnchoredObj->ConsiderForTextWrap() ||
( mbIgnoreObjsInHeaderFooter && !bFooterHeader &&
pAnchoredObj->GetAnchorFrame()->FindFooterOrHeader() ) ||
- ( bAllowCompatWrap &&
!pAnchoredObj->GetFrameFormat().GetFollowTextFlow().GetValue() )
+ ( bAllowCompatWrap &&
!pAnchoredObj->GetFrameFormat().GetFollowTextFlow().GetValue() ) ||
+ ( !bAllowCompatWrap && bFooterHeader &&
com::sun::star::text::WrapTextMode_NONE == rFlyFormat.GetSurround() )
)
{
continue;
@@ -928,7 +931,6 @@ SwAnchoredObjList* SwTextFly::InitAnchoredObjList()
mpAnchoredObjList->insert( aInsPosIter, pAnchoredObj );
}
-const SwFormatSurround &rFlyFormat =
pAnchoredObj->GetFrameFormat().GetSurround();
// #i68520#
if ( rFlyFormat.IsAnchorOnly() &&
pAnchoredObj->GetAnchorFrame() == GetMaster() )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: emfio/qa emfio/source tools/source
emfio/qa/cppunit/emf/EmfImportTest.cxx | 47 ---
emfio/qa/cppunit/emf/data/TestArcStartPointEqualEndPoint.emf |binary
emfio/source/reader/emfreader.cxx| 19
tools/source/generic/poly.cxx|6 -
4 files changed, 40 insertions(+), 32 deletions(-)
New commits:
commit fb5247bf587518eaa01cf5d54dceddf73827d740
Author: Bartosz Kosiorek
AuthorDate: Thu May 20 23:27:45 2021 +0200
Commit: Bartosz Kosiorek
CommitDate: Fri May 21 07:30:28 2021 +0200
tdf#55007 tdf#142263 tdf#142268 EMF ARC, PIE, CHORD allow to draw circle
In Metafile specification, if Start Point is the same as End Point,
then the full circle should be drawn.
Unfortunately with previous implementation, if Start Point is the same
as End Point, nothing is drawn.
This patch fixes that and removed EDGES optimizations, which causes
display issues.
Change-Id: I16a1b98f10378d57bed59696db6cc9f228044292
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115891
Tested-by: Jenkins
Reviewed-by: Bartosz Kosiorek
diff --git a/emfio/qa/cppunit/emf/EmfImportTest.cxx
b/emfio/qa/cppunit/emf/EmfImportTest.cxx
index 64c7effa1baa..bca5cbc161e3 100644
--- a/emfio/qa/cppunit/emf/EmfImportTest.cxx
+++ b/emfio/qa/cppunit/emf/EmfImportTest.cxx
@@ -53,6 +53,7 @@ class Test : public test::BootstrapFixture, public
XmlTestTools, public unotest:
void TestTextMapMode();
void TestEnglishMapMode();
void TestRectangleWithModifyWorldTransform();
+void TestArcStartPointEqualEndPoint();
void TestArcInsideWronglyDefinedRectangle();
void TestChordWithModifyWorldTransform();
void TestEllipseWithSelectClipPath();
@@ -82,6 +83,7 @@ public:
CPPUNIT_TEST(TestTextMapMode);
CPPUNIT_TEST(TestEnglishMapMode);
CPPUNIT_TEST(TestRectangleWithModifyWorldTransform);
+CPPUNIT_TEST(TestArcStartPointEqualEndPoint);
CPPUNIT_TEST(TestArcInsideWronglyDefinedRectangle);
CPPUNIT_TEST(TestChordWithModifyWorldTransform);
CPPUNIT_TEST(TestEllipseWithSelectClipPath);
@@ -357,9 +359,28 @@ void Test::TestChordWithModifyWorldTransform()
xmlDocUniquePtr pDocument =
dumper.dumpAndParse(comphelper::sequenceToContainer(aSequence));
CPPUNIT_ASSERT (pDocument);
-assertXPath(pDocument, "/primitive2D/metafile/transform/polypolygoncolor",
"color", "#ff");
-assertXPath(pDocument,
"/primitive2D/metafile/transform/polypolygoncolor/polypolygon", "path", "m590
448-154 93-54 57-21 45 24 67 45 21 224-6 265-97z");
-assertXPathContent(pDocument,
"/primitive2D/metafile/transform/polygonstroke/polygon", "590,448 436,541
382,598 361,643 385,710 430,731 654,725 919,628");
+assertXPath(pDocument, "/primitive2D/metafile/transform/polypolygoncolor",
+"color", "#ff");
+assertXPath(pDocument,
"/primitive2D/metafile/transform/polypolygoncolor/polypolygon",
+"path", "m590 448-21 45-66 24-34 12-33 12-21 45-33 12 12 33-33
12 12 33 12 34 33-12 12 33 34-12 33-12 45 21 33-12 33-12 46 21 66-25 33-12
66-24 34-12 66-24z");
+assertXPathContent(pDocument,
"/primitive2D/metafile/transform/polygonstroke/polygon",
+ "590,448 569,493 503,517 469,529 436,541 415,586
382,598 394,631 361,643 361,643 373,676 373,676 385,710 418,698 430,731 464,719
497,707 542,728 575,716 608,704 654,725 720,700 753,688 819,664 853,652
919,628");
+}
+
+void Test::TestArcStartPointEqualEndPoint()
+{
+// i73608 EMF import test where StartPoint == EndPoint. It should draw
full circle
+// Records: SETMAPMODE, SETWINDOWEXTEX, SETWINDOWORGEX, EXTSELECTCLIPRGN,
INTERSECTCLIPRECT, MOVETOEX, ARC
+Primitive2DSequence aSequence =
parseEmf(u"/emfio/qa/cppunit/emf/data/TestArcStartPointEqualEndPoint.emf");
+CPPUNIT_ASSERT_EQUAL(1, static_cast(aSequence.getLength()));
+drawinglayer::Primitive2dXmlDump dumper;
+xmlDocUniquePtr pDocument =
dumper.dumpAndParse(comphelper::sequenceToContainer(aSequence));
+CPPUNIT_ASSERT (pDocument);
+
+assertXPath(pDocument,
"/primitive2D/metafile/transform/mask/group/mask/polygonhairline",
+"color", "#00");
+assertXPathContent(pDocument,
"/primitive2D/metafile/transform/mask/group/mask/polygonhairline/polygon",
+ "11886,23133 11970,23223 12051,23316 12131,23410
12208,23506 12282,23604 12354,23704 12424,23805 12491,23909 12556,24014
12618,24120 12677,24228 12734,24337 12788,24448 12839,24560 12888,24673
12933,24788 12976,24903 13016,25020 13053,25137 13087,25256 13119,25375
13147,25495 13172,25615 13195,25736 13214,25858 13230,25980 13244,26103
13254,26225 13261,26348 13266,26472 13267,26595 13265,26718 13260,26841
13253,26964 13242,27087 13228,27209 13211,27331 13191,27453 13168,27574
13142,27694 13113,27814 13082,27933 13047,28051 13009,28169 12969,28285
12926,28400 12879,28514 12830,28628 12779,28739 12724,28850 1266
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - sw/qa sw/source
sw/qa/core/txtnode/data/title-field-invalidate.fodt |4 +++-
sw/source/core/txtnode/atrfld.cxx | 14 +++---
2 files changed, 14 insertions(+), 4 deletions(-)
New commits:
commit 50d58a15b548044e637b22c290ea52b4741a775a
Author: Miklos Vajna
AuthorDate: Wed May 19 10:24:32 2021 +0200
Commit: Mike Kaganski
CommitDate: Fri May 21 06:22:59 2021 +0200
sw: fix not needed invalidation of custom field on each keypress
And do the same for modification fields (e.g. modification date) and
subject fields as well. In all cases the layout already reacts to the
doc model change via normal notifications, no need to force anything.
(Confirmed with manual testing.)
This builds on top of commit 0a32630d11ebdb8b8218faa066c72582ef2f300d
(sw: fix not needed invalidation of title field on each keypress,
2021-05-18).
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115784
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
(cherry picked from commit 1dcd3f1b9fc0d888e047e854a20e9ab2e0afd544)
Change-Id: I8015b33a6680d75cd5b6446eb9275bb018ea7613
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115875
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Mike Kaganski
diff --git a/sw/qa/core/txtnode/data/title-field-invalidate.fodt
b/sw/qa/core/txtnode/data/title-field-invalidate.fodt
index e47129538fa9..e7d07cab7b63 100644
--- a/sw/qa/core/txtnode/data/title-field-invalidate.fodt
+++ b/sw/qa/core/txtnode/data/title-field-invalidate.fodt
@@ -1,7 +1,9 @@
http://purl.org/dc/elements/1.1/";
xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0"
xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
office:mimetype="application/vnd.oasis.opendocument.text">
+mysubject
mytitle
+1.1
@@ -11,7 +13,7 @@
-mytitle
+mysubject
mytitle 1.1 May 18,
2021
diff --git a/sw/source/core/txtnode/atrfld.cxx
b/sw/source/core/txtnode/atrfld.cxx
index d5f76f7ce4bd..ffb7aed2c5e0 100644
--- a/sw/source/core/txtnode/atrfld.cxx
+++ b/sw/source/core/txtnode/atrfld.cxx
@@ -317,16 +317,24 @@ void SwFormatField::Modify( const SfxPoolItem* pOld,
const SfxPoolItem* pNew )
bool bForceNotify = (pOld == nullptr) && (pNew == nullptr);
if (bForceNotify)
{
-// Force notify was added for conditional text fields, at least the
title fields needs
+// Force notify was added for conditional text fields, at least the
below fields need
// no forced notify.
const SwField* pField = mpTextField->GetFormatField().GetField();
const SwFieldIds nWhich = pField->GetTyp()->Which();
if (nWhich == SwFieldIds::DocInfo)
{
auto pDocInfoField = static_cast(pField);
-if (pDocInfoField->GetSubType() == nsSwDocInfoSubType::DI_TITLE)
+sal_uInt16 nSubType = pDocInfoField->GetSubType();
+// Do not consider extended SubTypes.
+nSubType &= 0xff;
+switch (nSubType)
{
-bForceNotify = false;
+case nsSwDocInfoSubType::DI_TITLE:
+case nsSwDocInfoSubType::DI_THEMA:
+case nsSwDocInfoSubType::DI_CHANGE:
+case nsSwDocInfoSubType::DI_CUSTOM:
+bForceNotify = false;
+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/co-2021' - sw/qa sw/source
sw/qa/core/txtnode/data/title-field-invalidate.fodt |4 +++-
sw/source/core/txtnode/atrfld.cxx | 14 +++---
2 files changed, 14 insertions(+), 4 deletions(-)
New commits:
commit 93d6b09c33ae9f17e26266c3b8f7122a60a4ae0b
Author: Miklos Vajna
AuthorDate: Wed May 19 10:24:32 2021 +0200
Commit: Mike Kaganski
CommitDate: Fri May 21 06:19:23 2021 +0200
sw: fix not needed invalidation of custom field on each keypress
And do the same for modification fields (e.g. modification date) and
subject fields as well. In all cases the layout already reacts to the
doc model change via normal notifications, no need to force anything.
(Confirmed with manual testing.)
This builds on top of commit 0a32630d11ebdb8b8218faa066c72582ef2f300d
(sw: fix not needed invalidation of title field on each keypress,
2021-05-18).
(cherry picked from commit 1dcd3f1b9fc0d888e047e854a20e9ab2e0afd544)
Change-Id: I8015b33a6680d75cd5b6446eb9275bb018ea7613
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115874
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Mike Kaganski
diff --git a/sw/qa/core/txtnode/data/title-field-invalidate.fodt
b/sw/qa/core/txtnode/data/title-field-invalidate.fodt
index e47129538fa9..e7d07cab7b63 100644
--- a/sw/qa/core/txtnode/data/title-field-invalidate.fodt
+++ b/sw/qa/core/txtnode/data/title-field-invalidate.fodt
@@ -1,7 +1,9 @@
http://purl.org/dc/elements/1.1/";
xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0"
xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
office:mimetype="application/vnd.oasis.opendocument.text">
+mysubject
mytitle
+1.1
@@ -11,7 +13,7 @@
-mytitle
+mysubject
mytitle 1.1 May 18,
2021
diff --git a/sw/source/core/txtnode/atrfld.cxx
b/sw/source/core/txtnode/atrfld.cxx
index bb95a8799081..98d4b235220f 100644
--- a/sw/source/core/txtnode/atrfld.cxx
+++ b/sw/source/core/txtnode/atrfld.cxx
@@ -380,16 +380,24 @@ void SwFormatField::UpdateTextNode(const SfxPoolItem*
pOld, const SfxPoolItem* p
bool bForceNotify = pOld == nullptr && pNew == nullptr;
if (bForceNotify)
{
-// Force notify was added for conditional text fields, at least
the title fields needs
+// Force notify was added for conditional text fields, at least
the below fields need
// no forced notify.
const SwField* pField = mpTextField->GetFormatField().GetField();
const SwFieldIds nWhich = pField->GetTyp()->Which();
if (nWhich == SwFieldIds::DocInfo)
{
auto pDocInfoField = static_cast(pField);
-if (pDocInfoField->GetSubType() ==
nsSwDocInfoSubType::DI_TITLE)
+sal_uInt16 nSubType = pDocInfoField->GetSubType();
+// Do not consider extended SubTypes.
+nSubType &= 0xff;
+switch (nSubType)
{
-bForceNotify = false;
+case nsSwDocInfoSubType::DI_TITLE:
+case nsSwDocInfoSubType::DI_SUBJECT:
+case nsSwDocInfoSubType::DI_CHANGE:
+case nsSwDocInfoSubType::DI_CUSTOM:
+bForceNotify = false;
+break;
}
}
}
___
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/docshell/impex.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 6155689bb6f1d72f29b43ac5ae94b32522ef9b42
Author: Mike Kaganski
AuthorDate: Fri May 21 00:03:43 2021 +0200
Commit: Mike Kaganski
CommitDate: Fri May 21 06:11:23 2021 +0200
tdf#142395: properly handle "no string delimiter" case
In this case, the delimiter character value would be '\0'.
Change-Id: Idb0f01756991b3ea35a92f11b78fddd56c25265a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115839
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx
index 3e58a9767cbe..b1a553a2ac10 100644
--- a/sc/source/ui/docshell/impex.cxx
+++ b/sc/source/ui/docshell/impex.cxx
@@ -1592,7 +1592,7 @@ const sal_Unicode*
ScImportExport::ScanNextFieldFromString( const sal_Unicode* p
rbIsQuoted = false;
rField.clear();
const sal_Unicode cBlank = ' ';
-if (!ScGlobal::UnicodeStrChr( pSeps, cBlank))
+if (cStr && !ScGlobal::UnicodeStrChr(pSeps, cBlank))
{
// Cope with broken generators that put leading blanks before a quoted
// field, like "field1", "field2", "..."
@@ -1603,7 +1603,7 @@ const sal_Unicode*
ScImportExport::ScanNextFieldFromString( const sal_Unicode* p
if (*pb == cStr)
p = pb;
}
-if ( *p == cStr ) // String in quotes
+if (cStr && *p == cStr) // String in quotes
{
rbIsQuoted = true;
const sal_Unicode* p1;
___
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 eda109d5d91e82adb675ebf6db952bf6d82b3391 Author: Steve Fanning AuthorDate: Fri May 21 01:17:43 2021 +0200 Commit: Gerrit Code Review CommitDate: Fri May 21 01:17:43 2021 +0200 Update git submodules * Update helpcontent2 from branch 'master' to ab50f2ccc57ebe577cbdad4afa29b66317b87bcc - Fix text in 2nd example given in help description of Calc's EOMONTH function. The statement that the date MUST be in ISO format is not quite correct. Also add link to updated wiki page. Change-Id: I20158373f8a67ae90cd1bfccb9fbe1d7c011077f Reviewed-on: https://gerrit.libreoffice.org/c/help/+/115838 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 44bd3d8205dd..ab50f2ccc57e 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 44bd3d8205dd9020b9725a03518cb1316d3062fa +Subproject commit ab50f2ccc57ebe577cbdad4afa29b66317b87bcc ___ 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/scalc/01/func_eomonth.xhp |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit ab50f2ccc57ebe577cbdad4afa29b66317b87bcc
Author: Steve Fanning
AuthorDate: Thu May 20 21:43:42 2021 +0200
Commit: Olivier Hallot
CommitDate: Fri May 21 01:17:43 2021 +0200
Fix text in 2nd example given in help description of Calc's EOMONTH
function.
The statement that the date MUST be in ISO format is not quite correct.
Also add link to updated wiki page.
Change-Id: I20158373f8a67ae90cd1bfccb9fbe1d7c011077f
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/115838
Tested-by: Jenkins
Reviewed-by: Olivier Hallot
diff --git a/source/text/scalc/01/func_eomonth.xhp
b/source/text/scalc/01/func_eomonth.xhp
index 186c4e948..74d3af592 100644
--- a/source/text/scalc/01/func_eomonth.xhp
+++ b/source/text/scalc/01/func_eomonth.xhp
@@ -40,8 +40,9 @@
What is the
last day of the month that falls 6 months after September 14 2001?
=EOMONTH(DATE(2001;9;14);6) returns the serial number
37346. Formatted as a date, this is 2002-03-31.
-=EOMONTH("2001-09-14";6) works as well. If the date is
given as string, it has to be in ISO format.
+=EOMONTH("2001-09-14";6) works as well. If you specify the
date directly, we recommend using the standard ISO 8601 format because this
should be independent of your selected locale settings.
+https://wiki.documentfoundation.org/Documentation/Calc_Functions/EOMONTH";>EOMONTH
wiki page
___
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 235f570cdc9e57d32257b5c1e599eec24f89836f Author: Steve Fanning AuthorDate: Fri May 21 01:15:09 2021 +0200 Commit: Gerrit Code Review CommitDate: Fri May 21 01:15:09 2021 +0200 Update git submodules * Update helpcontent2 from branch 'master' to 44bd3d8205dd9020b9725a03518cb1316d3062fa - Add example to help description for Calc's CLEAN function. Change-Id: Iae7a1f0b8b84be33f5f54a9a7116c0c48670f917 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/115833 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 774b852c14a4..44bd3d8205dd 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 774b852c14a4a8df49c9ad35e609d8060b9b46a1 +Subproject commit 44bd3d8205dd9020b9725a03518cb1316d3062fa ___ 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/scalc/01/04060110.xhp |4
1 file changed, 4 insertions(+)
New commits:
commit 44bd3d8205dd9020b9725a03518cb1316d3062fa
Author: Steve Fanning
AuthorDate: Wed May 19 22:21:04 2021 +0200
Commit: Olivier Hallot
CommitDate: Fri May 21 01:15:09 2021 +0200
Add example to help description for Calc's CLEAN function.
Change-Id: Iae7a1f0b8b84be33f5f54a9a7116c0c48670f917
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/115833
Tested-by: Jenkins
Reviewed-by: Olivier Hallot
diff --git a/source/text/scalc/01/04060110.xhp
b/source/text/scalc/01/04060110.xhp
index 59ded0137..3a4ab2306 100644
--- a/source/text/scalc/01/04060110.xhp
+++ b/source/text/scalc/01/04060110.xhp
@@ -163,6 +163,10 @@
CLEAN("Text")
Text refers to the text from which to remove all non-printable
characters.
+
+
+=LEN(CLEAN(CHAR(7) & "LibreOffice Calc"
& CHAR(8))) returns 16, showing that the CLEAN function removes the
non-printable Unicode U+0007 ("BEL") and U+0008 ("BS") characters at the
beginning and end of the string argument. CLEAN does not remove
spaces.
+
___
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 0e503761df294f7a33eeba99a15f03125be97906 Author: Rafael Lima AuthorDate: Fri May 21 01:12:12 2021 +0200 Commit: Gerrit Code Review CommitDate: Fri May 21 01:12:12 2021 +0200 Update git submodules * Update helpcontent2 from branch 'master' to 774b852c14a4a8df49c9ad35e609d8060b9b46a1 - tdf#141929 Improve CONVERT help and move to a separate file Updates the content of the CONVERT help page to better match the description in the wiki, focusing in unit measurement and prefix tables. Also moves the CONVERT help page to a separate file and removes it from the original location 04060116.xhp. Change-Id: I591ce3d2cd36e224daf5d00593418cba7832e574 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/115209 Tested-by: Jenkins Reviewed-by: Steve Fanning Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 975230c5cd94..774b852c14a4 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 975230c5cd9402e1da8ef50ce31a4682306bfbf8 +Subproject commit 774b852c14a4a8df49c9ad35e609d8060b9b46a1 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: AllLangHelp_scalc.mk source/text
AllLangHelp_scalc.mk |1 source/text/scalc/01/04060116.xhp | 332 -- source/text/scalc/01/ful_func.xhp | 68 - source/text/scalc/01/func_convert.xhp | 1741 ++ 4 files changed, 1792 insertions(+), 350 deletions(-) New commits: commit 774b852c14a4a8df49c9ad35e609d8060b9b46a1 Author: Rafael Lima AuthorDate: Sat May 8 15:56:59 2021 +0200 Commit: Olivier Hallot CommitDate: Fri May 21 01:12:12 2021 +0200 tdf#141929 Improve CONVERT help and move to a separate file Updates the content of the CONVERT help page to better match the description in the wiki, focusing in unit measurement and prefix tables. Also moves the CONVERT help page to a separate file and removes it from the original location 04060116.xhp. Change-Id: I591ce3d2cd36e224daf5d00593418cba7832e574 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/115209 Tested-by: Jenkins Reviewed-by: Steve Fanning Reviewed-by: Olivier Hallot diff --git a/AllLangHelp_scalc.mk b/AllLangHelp_scalc.mk index 0535a0ca2..3cca39631 100644 --- a/AllLangHelp_scalc.mk +++ b/AllLangHelp_scalc.mk @@ -196,6 +196,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,scalc,\ helpcontent2/source/text/scalc/01/func_countifs \ helpcontent2/source/text/scalc/01/func_color \ helpcontent2/source/text/scalc/01/func_concat \ +helpcontent2/source/text/scalc/01/func_convert \ helpcontent2/source/text/scalc/01/func_date \ helpcontent2/source/text/scalc/01/func_datedif \ helpcontent2/source/text/scalc/01/func_datevalue \ diff --git a/source/text/scalc/01/04060116.xhp b/source/text/scalc/01/04060116.xhp index 9d554aa81..06141e181 100644 --- a/source/text/scalc/01/04060116.xhp +++ b/source/text/scalc/01/04060116.xhp @@ -383,329 +383,17 @@ =OCT2HEX(144;4) returns 0064. - -CONVERT function - - -CONVERT - Converts a value from one unit of measure to the corresponding value in another unit of measure. Enter the units of measures directly as text in quotation marks or as a reference. If you enter the units of measure in cells, they must correspond exactly with the following list which is case sensitive: For example, in order to enter a lower case l (for liter) in a cell, enter the apostrophe ' immediately followed by l. - - - - Property - - - Units - - - - - Weight - - - g, sg, lbm, u, ozm, stone, ton, grain, pweight, hweight, shweight, brton - - - - - Length - - - m, mi, Nmi, in, ft, yd, ang, Pica, ell, parsec, lightyear, survey_mi - - - - - Time - - - yr, day, hr, mn, sec, s - - - - - Pressure - - - Pa, atm, at, mmHg, Torr, psi - - - - - Force - - - N, dyn, dy, lbf, pond - - - - - Energy - - - J, e, c, cal, eV, ev, HPh, Wh, wh, flb, BTU, btu - - - - - Power - - - W, w, HP, PS - - - - - Field strength - - - T, ga - - - - - Temperature - - - C, F, K, kel, Reau, Rank - - - - - Volume - - - l, L, lt, tsp, tbs, oz, cup, pt, us_pt, qt, gal, m3, mi3, Nmi3, in3, ft3, yd3, ang3, Pica3, barrel, bushel, regton, Schooner, Middy, Glass - - - - - Area - - - m2, mi2, Nmi2, in2, ft2, yd2, ang2, Pica2, Morgen, ar, acre, ha - - - - - Speed - - - m/s, m/sec, m/h, mph, kn, admkn - - - - - Information - - - bit, byte -
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ccbadd6c90c63b06534602eccdbb339f4f574217 Author: Olivier Hallot AuthorDate: Thu May 20 20:06:54 2021 -0300 Commit: Gerrit Code Review CommitDate: Fri May 21 01:06:54 2021 +0200 Update git submodules * Update helpcontent2 from branch 'master' to 975230c5cd9402e1da8ef50ce31a4682306bfbf8 - tdf#142389 (part) Fix link to autofilter help Change-Id: I689ab1d93242a74da72f1792965399f74fbb2f5a Reviewed-on: https://gerrit.libreoffice.org/c/help/+/115885 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index bd3e4888b2b4..975230c5cd94 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit bd3e4888b2b47d022871218f210b290b7d046288 +Subproject commit 975230c5cd9402e1da8ef50ce31a4682306bfbf8 ___ 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/scalc/01/12040100.xhp |2 ++ 1 file changed, 2 insertions(+) New commits: commit 975230c5cd9402e1da8ef50ce31a4682306bfbf8 Author: Olivier Hallot AuthorDate: Thu May 20 14:29:24 2021 -0300 Commit: Olivier Hallot CommitDate: Fri May 21 01:06:54 2021 +0200 tdf#142389 (part) Fix link to autofilter help Change-Id: I689ab1d93242a74da72f1792965399f74fbb2f5a Reviewed-on: https://gerrit.libreoffice.org/c/help/+/115885 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/scalc/01/12040100.xhp b/source/text/scalc/01/12040100.xhp index 81e11c3b4..94d48c48b 100644 --- a/source/text/scalc/01/12040100.xhp +++ b/source/text/scalc/01/12040100.xhp @@ -26,6 +26,8 @@ + + AutoFilter Automatically filters the selected cell range, and creates one-row list boxes where you can choose the items that you want to display. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa
sw/qa/extras/uiwriter/data/tdf142157.odt |binary
sw/qa/extras/uiwriter/uiwriter.cxx | 19 +++
2 files changed, 19 insertions(+)
New commits:
commit aa6e9cceddfb154c2207ab316cb7625655452953
Author: Xisco Fauli
AuthorDate: Thu May 20 14:37:10 2021 +0200
Commit: Xisco Fauli
CommitDate: Fri May 21 00:34:30 2021 +0200
tdf#142157: sw_uiwriter: Add unittest
Change-Id: I2dbc2f09d61220100fb616c28a8f2557c84f460f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115871
Tested-by: Jenkins
Reviewed-by: Xisco Fauli
diff --git a/sw/qa/extras/uiwriter/data/tdf142157.odt
b/sw/qa/extras/uiwriter/data/tdf142157.odt
new file mode 100644
index ..072c86889335
Binary files /dev/null and b/sw/qa/extras/uiwriter/data/tdf142157.odt differ
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx
b/sw/qa/extras/uiwriter/uiwriter.cxx
index e7d9e38153ab..8ef3de9d6a60 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -346,6 +346,7 @@ public:
void testMsWordCompTrailingBlanks();
void testCreateDocxAnnotation();
void testTdf107976();
+void testTdf142157();
void testTdf108524();
void testRhbz1810732();
void testTableInSection();
@@ -577,6 +578,7 @@ public:
CPPUNIT_TEST(testMsWordCompTrailingBlanks);
CPPUNIT_TEST(testCreateDocxAnnotation);
CPPUNIT_TEST(testTdf107976);
+CPPUNIT_TEST(testTdf142157);
CPPUNIT_TEST(testTdf108524);
CPPUNIT_TEST(testRhbz1810732);
CPPUNIT_TEST(testTableInSection);
@@ -6739,6 +6741,23 @@ void SwUiWriterTest::testRhbz1810732()
}
}
+void SwUiWriterTest::testTdf142157()
+{
+mxComponent = loadFromDesktop("private:factory/swriter",
"com.sun.star.text.TextDocument");
+
+const OUString insertFileid = m_directories.getURLFromSrc(DATA_DIRECTORY)
+ "tdf142157.odt";
+uno::Sequence
aPropertyValues(comphelper::InitPropertySequence({ { "Name",
uno::makeAny(insertFileid) } }));
+dispatchCommand(mxComponent, ".uno:InsertDoc", aPropertyValues);
+
+uno::Reference
xTextSectionsSupplier(mxComponent, uno::UNO_QUERY);
+uno::Reference
xSections(xTextSectionsSupplier->getTextSections(), uno::UNO_QUERY);
+
+// Without the fix in place, this test would have failed with
+// - Expected: 1
+// - Actual : 0
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xSections->getCount());
+}
+
void SwUiWriterTest::testTdf108524()
{
createDoc("tdf108524.odt");
___
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/core/text/data/line-height.fodt | 32
sw/qa/core/text/text.cxx | 16
sw/source/core/inc/txtfrm.hxx |2 +-
sw/source/core/text/frmcrsr.cxx |2 +-
sw/source/core/text/frmform.cxx |8
sw/source/core/text/frmpaint.cxx |4 ++--
sw/source/core/text/inftxt.cxx|4 ++--
sw/source/core/text/itrcrsr.cxx | 10 +-
sw/source/core/text/itrform2.cxx | 26 +-
sw/source/core/text/itrpaint.cxx | 12 ++--
sw/source/core/text/itrtxt.cxx| 10 +-
sw/source/core/text/itrtxt.hxx|8
sw/source/core/text/porfld.cxx|8
sw/source/core/text/porfly.cxx|2 +-
sw/source/core/text/porlay.cxx|8
sw/source/core/text/porlay.hxx| 10 +-
sw/source/core/text/porlin.hxx|8
sw/source/core/text/pormulti.cxx | 10 +-
sw/source/core/text/porrst.cxx|2 +-
sw/source/core/text/possiz.hxx| 30 +++---
sw/source/core/text/txtdrop.cxx | 10 +-
sw/source/core/text/txtfrm.cxx|4 ++--
22 files changed, 137 insertions(+), 89 deletions(-)
New commits:
commit 301278b656e76b6f42af5cf8a6f5c6c02acfffeb
Author: Miklos Vajna
AuthorDate: Thu May 20 18:02:12 2021 +0200
Commit: Miklos Vajna
CommitDate: Thu May 20 22:38:03 2021 +0200
sw: allow the height of a line to be larger than 65536 twips
The line height can be quite large if the line contains an as-char
image.
Found by temporarily changing static_cast() in sw/ to a
template function to make these conversions implicit (excluding cases
where the input and output types can't convert implicitly), then asking
-fsanitize=implicit-unsigned-integer-truncation
-fsanitize=implicit-signed-integer-truncation to flag the problematic
conversions.
The first hit was in SwFlyCntPortion::SetBase() (that's where 67408
turns into 1872), then the same pattern at many other places.
Change-Id: Ie12f490ed8dd5c531f11506c97598ce4f7610e2e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115873
Reviewed-by: Miklos Vajna
Tested-by: Jenkins
diff --git a/sw/qa/core/text/data/line-height.fodt
b/sw/qa/core/text/data/line-height.fodt
new file mode 100644
index ..d784ec241bed
--- /dev/null
+++ b/sw/qa/core/text/data/line-height.fodt
@@ -0,0 +1,32 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ iVBORw0KGgoNSUhEUgAAAEBACAQAYLlVBGdBTUEAALGPC/xhBQFz
+ UkdCAK7OHOkgY0hSTQAAeiYAAICEAAD6gOgAAHUwAADqYAAAOpgAABdwnLpRPAAA
+ AAJiS0dEAACqjSMyCW9GRnMGAAAMc1XTCXBIWXMAAA3XAAAN1wFCKJt4
+ CXZwQWcAAABMQACdMTgbAAABzUlEQVRo3u3ZPU/CQBjA8X+Jxs3ESUDj4iK+LA5+
+ BBfjqBE1cXB2MlFAEqMgxvhNNL4sLsK3UPQL6ObkoAETz+FKW2mxCPRYnucWUu76/OC59C49
+ cGOCKqrD9kHRc6ddPv7oW2WCwMh0nF63Myz7Tm8hPTNu0pgHMER3scepTbgK6enJNND83RLn
+ /878yRaPmgBZFDuMsNLeWB9gmFQHP77MIg9gsYciR50NFKvtjIy10yk84pSZA7DYpwR8scmF
+ QQCMuoQMpzbh0iAARrlnVn90CWHTsZcAiHPPdINQAuqsc2MQAAnKDUKWEhZ10twaBEDSJWQo
+ YlFj7S9CzwEegkXWIbQsRAQASFJhpplwbRAACS+hANRJBxMiAkDcJeQ4sQkBhYgMoJ+Ozlwo
+ 2YQ7AJ6CRxyiUGnVy3hVKb0Af9v7hUG2Wy9TEQCUelFTDULB2S+YKYGOMcpM6UIccOQnRA6A
+ cSp6ibfI+wkGADBGpTEd8xz1AaAfTQ7huA8AvUw5hVjuA0D/C5OaMN8XACRZ8F0zCggKAQhA
+ AAIQgAAEIAABCEAAAhCAAAQgAAH4zg3feY4w3Xs44M5+oW0qvCWoGcvaIlM3x/f/ab+O738A
+ hOCNQr34oD4ldEVYdGNyZWF0ZS1kYXRlADIwMTAtMTItMjBUMTc6MDg6MzYrMDE6MDB6
+ 5RscJXRFWHRtb2RpZnktZGF0ZQAyMDEwLTEyLTIwVDE3OjA4OjM3KzAxOjAwgyNmnAAA
+ AABJRU5ErkJggg==
+
+
+
+
diff --git a/sw/qa/core/text/text.cxx b/sw/qa/core/text/text.cxx
index 4db880e687f4..d38b6a3e62cc 100644
--- a/sw/qa/core/text/text.cxx
+++ b/sw/qa/core/text/text.cxx
@@ -135,6 +135,22 @@ CPPUNIT_TEST_FIXTURE(SwCoreTextTest,
testTabOverMarginSection)
CPPUNIT_ASSERT_LESS(static_cast(5000), nWidth);
}
+CPPUNIT_TEST_FIXTURE(SwCoreTextTest, testLineHeight)
+{
+// Given a document with an as-char image, height in twips not fitting
into sal_uInt16:
+createSwDoc(DATA_DIRECTORY, "line-height.fodt");
+
+// When laying out that document:
+xmlDocUniquePtr pXmlDoc = parseLayoutDump();
+
+// Then make sure its top is the top of the page:
+// Without the accompanying fix in place, this test would have failed with:
+// - Expected: 284
+// - Actual : -65252
+// due to various unsigned integer truncations.
+assertXPath(pXmlDoc, "//fly/infos/bounds", "top",
OUString::number(DOCUMENTBORDER));
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/txtfrm.hxx b/sw/source/core/inc/txtfrm.hxx
index abef52f448aa..0a2f4fbbd2bc 100644
--- a/sw/source/core/inc/txtfrm.hxx
+++ b/sw/s
[Libreoffice-commits] core.git: vcl/commonfuzzer.mk
vcl/commonfuzzer.mk |1 + 1 file changed, 1 insertion(+) New commits: commit 6cc4750f36fb505e1d7b8d1406f170807fa55644 Author: Caolán McNamara AuthorDate: Thu May 20 19:42:40 2021 +0100 Commit: Caolán McNamara CommitDate: Thu May 20 21:08:33 2021 +0200 ofz: fix build Change-Id: I2875536139397070f7e99f1f621d8212687dee47 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115886 Tested-by: Caolán McNamara Reviewed-by: Caolán McNamara diff --git a/vcl/commonfuzzer.mk b/vcl/commonfuzzer.mk index 3e0891ac3b0f..6541d9ec7360 100644 --- a/vcl/commonfuzzer.mk +++ b/vcl/commonfuzzer.mk @@ -146,6 +146,7 @@ fuzzer_calc_libraries = \ scfilt \ scd \ vbaevents \ +vbahelper \ vbaobj \ sc \ for \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: desktop/source extensions/source fpicker/source sw/source uui/source
desktop/source/deployment/gui/dp_gui_dialog2.cxx |8 +++---
desktop/source/deployment/gui/dp_gui_dialog2.hxx |2 -
extensions/source/abpilot/abpfinalpage.cxx |8 +++---
extensions/source/abpilot/abpfinalpage.hxx |4 +--
extensions/source/scanner/sanedlg.cxx| 29 ++-
extensions/source/scanner/sanedlg.hxx|1
fpicker/source/office/iodlg.cxx | 21 +++-
fpicker/source/office/iodlg.hxx |4 +--
sw/source/ui/table/convert.cxx |8 +++---
sw/source/uibase/inc/convert.hxx |4 +--
uui/source/logindlg.cxx |4 +--
uui/source/logindlg.hxx |2 -
uui/source/secmacrowarnings.cxx |4 +--
uui/source/secmacrowarnings.hxx |2 -
14 files changed, 54 insertions(+), 47 deletions(-)
New commits:
commit bb166403ef1026e3665b2d60810c71955d7402c0
Author: Caolán McNamara
AuthorDate: Thu May 20 15:30:35 2021 +0100
Commit: Caolán McNamara
CommitDate: Thu May 20 20:27:38 2021 +0200
use toggle instead of click for CheckButton
Change-Id: I7196581a8b7c307d531f6995e1c24db746afdb26
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115883
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
index 730854127ac2..00d2603e529d 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
@@ -448,9 +448,9 @@ ExtMgrDialog::ExtMgrDialog(weld::Window *pParent,
TheExtensionManager *pManager)
m_xCancelBtn->connect_clicked( LINK( this, ExtMgrDialog, HandleCancelBtn )
);
-m_xBundledCbx->connect_clicked( LINK( this, ExtMgrDialog, HandleExtTypeCbx
) );
-m_xSharedCbx->connect_clicked( LINK( this, ExtMgrDialog, HandleExtTypeCbx
) );
-m_xUserCbx->connect_clicked( LINK( this, ExtMgrDialog, HandleExtTypeCbx )
);
+m_xBundledCbx->connect_toggled( LINK( this, ExtMgrDialog, HandleExtTypeCbx
) );
+m_xSharedCbx->connect_toggled( LINK( this, ExtMgrDialog, HandleExtTypeCbx
) );
+m_xUserCbx->connect_toggled( LINK( this, ExtMgrDialog, HandleExtTypeCbx )
);
m_xBundledCbx->set_active(true);
m_xSharedCbx->set_active(true);
@@ -905,7 +905,7 @@ IMPL_LINK_NOARG(ExtMgrDialog, HandleEnableBtn,
weld::Button&, void)
}
}
-IMPL_LINK_NOARG(ExtMgrDialog, HandleExtTypeCbx, weld::Button&, void)
+IMPL_LINK_NOARG(ExtMgrDialog, HandleExtTypeCbx, weld::ToggleButton&, void)
{
// re-creates the list of packages with addEntry selecting the packages
prepareChecking();
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.hxx
b/desktop/source/deployment/gui/dp_gui_dialog2.hxx
index 40faf4548313..424ad607f7fa 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.hxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.hxx
@@ -132,7 +132,7 @@ class ExtMgrDialog : public weld::GenericDialogController
DECL_LINK( HandleUpdateBtn, weld::Button&, void );
DECL_LINK( HandleCancelBtn, weld::Button&, void );
DECL_LINK( HandleCloseBtn, weld::Button&, void );
-DECL_LINK( HandleExtTypeCbx, weld::Button&, void );
+DECL_LINK( HandleExtTypeCbx, weld::ToggleButton&, void );
DECL_LINK( TimeOutHdl, Timer *, void );
DECL_LINK( startProgress, void *, void );
diff --git a/extensions/source/abpilot/abpfinalpage.cxx
b/extensions/source/abpilot/abpfinalpage.cxx
index 802b0d853b52..609918899e0b 100644
--- a/extensions/source/abpilot/abpfinalpage.cxx
+++ b/extensions/source/abpilot/abpfinalpage.cxx
@@ -61,9 +61,9 @@ namespace abp
m_xName->connect_changed( LINK(this, FinalPage, OnEntryNameModified) );
m_xLocation->connect_changed( LINK(this, FinalPage,
OnComboNameModified) );
-m_xRegisterName->connect_clicked( LINK( this, FinalPage, OnRegister )
);
+m_xRegisterName->connect_toggled( LINK( this, FinalPage, OnRegister )
);
m_xRegisterName->set_active(true);
-m_xEmbed->connect_clicked( LINK( this, FinalPage, OnEmbed ) );
+m_xEmbed->connect_toggled( LINK( this, FinalPage, OnEmbed ) );
m_xEmbed->set_active(true);
}
@@ -204,7 +204,7 @@ namespace abp
implCheckName();
}
-IMPL_LINK_NOARG(FinalPage, OnRegister, weld::Button&, void)
+IMPL_LINK_NOARG(FinalPage, OnRegister, weld::ToggleButton&, void)
{
bool bEnable = m_xRegisterName->get_active();
m_xNameLabel->set_sensitive(bEnable);
@@ -212,7 +212,7 @@ namespace abp
implCheckName();
}
-IMPL_LINK_NOARG(FinalPage, OnEmbed, weld::Button&, void)
+IMPL_LINK_NOARG(FinalPage, OnEmbed, weld::ToggleButton&, void)
{
bool bEmbed = m_xEmbed->get_active();
m_xLocationLabel->set_sensitive(!bEmbed);
diff --git a/extensions/source/abpilot/abpfinalp
Re: Introducing myself and question
Bonsoir Mr, J'espère que vous allez bien. Je me permet de vous écrire car j'ai postuler pour la bourse Tek-up university et en effectuant des recherches sur cette université, je suis tombé sur votre nom. J'aimerais svp que vous partagez votre expérience avec moi afin que je sache à quoi m'attendre. J'ai eu des difficultés à trouver un moyen de vous joindre si ce n'est celui-ci. Merci d'avance ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/wasm' - config_host.mk.in cui/Library_cui.mk cui/source editeng/source external/hunspell external/hyphen external/mythes include/editeng lingucomponent/
Repository.mk | 17 +++-- RepositoryExternal.mk |2 ++ config_host.mk.in |1 + cui/Library_cui.mk |7 ++- cui/source/factory/dlgfact.cxx |4 cui/source/factory/dlgfact.hxx |4 editeng/source/misc/splwrap.cxx |4 external/hunspell/StaticLibrary_hunspell.mk |7 ++- external/hyphen/ExternalProject_hyphen.mk |2 ++ external/mythes/ExternalProject_mythes.mk |2 ++ include/editeng/edtdlg.hxx |2 ++ lingucomponent/Module_lingucomponent.mk |7 ++- postprocess/Rdb_services.mk | 11 --- solenv/bin/native-code.py | 16 solenv/gbuild/gbuild.mk |1 + 15 files changed, 67 insertions(+), 20 deletions(-) New commits: commit ec9e2c81b4ec6a1efce632a7fbc47683219582bf Author: Armin Le Grand (Allotropia) AuthorDate: Thu May 20 18:56:25 2021 +0200 Commit: Armin Le Grand (Allotropia) CommitDate: Thu May 20 18:56:25 2021 +0200 Wasm remove hunspell/hyphen optionally Change-Id: I104264202e147f7a037647b84f07647ae28f3e60 diff --git a/Repository.mk b/Repository.mk index 700d61a2e55a..613fe92f1892 100644 --- a/Repository.mk +++ b/Repository.mk @@ -365,6 +365,17 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ )) endif +ifneq ($(ENABLE_WASM_STRIP_HUNSPELL),TRUE) +$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ + hyphen \ + lnth \ + spell \ + $(if $(filter iOS MACOSX,$(OS)), \ + MacOSXSpell \ + ) \ +)) +endif + $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ $(call gb_Helper_optional,AVMEDIA,avmedia) \ $(if $(filter MACOSX,$(OS)),\ @@ -409,7 +420,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ fwk \ i18npool \ i18nsearch \ - hyphen \ icg \ $(if $(ENABLE_JAVA),jdbc) \ $(if $(ENABLE_LDAP),ldapbe2) \ @@ -417,7 +427,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ localebe1 \ log \ lng \ - lnth \ $(if $(filter $(OS),MACOSX),macbe1) \ $(if $(MERGELIBS),merged) \ migrationoo2 \ @@ -448,7 +457,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ sfx \ slideshow \ sot \ - spell \ $(if $(or $(DISABLE_GUI),$(ENABLE_WASM_STRIP_SPLASH)),,spl) \ storagefd \ $(call gb_Helper_optional,SCRIPTING,stringresource) \ @@ -499,9 +507,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ ) \ fps_aqua \ ) \ - $(if $(filter iOS MACOSX,$(OS)), \ - MacOSXSpell \ - ) \ )) $(eval $(call gb_Helper_register_plugins_for_install,OOOLIBS,ooo, \ diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index c7c530294aa9..7fe8b624d4ef 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -549,6 +549,7 @@ endef gb_ExternalProject__use_hunspell := else # !SYSTEM_HUNSPELL +ifneq ($(ENABLE_WASM_STRIP_HUNSPELL),TRUE) define gb_LinkTarget__use_hunspell $(call gb_LinkTarget_add_defs,$(1),\ @@ -576,6 +577,7 @@ $(call gb_ExternalProject_use_external_project,$(1),hunspell) endef +endif # ENABLE_WASM_STRIP_EXTRA endif # SYSTEM_HUNSPELL diff --git a/config_host.mk.in b/config_host.mk.in index f723a6559a1e..b7075e473c60 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -215,6 +215,7 @@ export ENABLE_WASM_STRIP_UCPHELP=@ENABLE_WASM_STRIP@ export ENABLE_WASM_STRIP_EPUB=@ENABLE_WASM_STRIP@ export ENABLE_WASM_STRIP_LOCALES=@ENABLE_WASM_STRIP@ export ENABLE_WASM_STRIP_GUESSLANG=@ENABLE_WASM_STRIP@ +export ENABLE_WASM_STRIP_HUNSPELL=@ENABLE_WASM_STRIP@ export ENABLE_WERROR=@ENABLE_WERROR@ export ENDIANNESS=@ENDIANNESS@ export EPM=@EPM@ diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk index 075085e659e4..dda524c97c41 100644 --- a/cui/Library_cui.mk +++ b/cui/Library_cui.mk @@ -99,6 +99,12 @@ $(eval $(call gb_Library_add_exception_objects,cui,\ )) endif +ifneq ($(ENABLE_WASM_STRIP_EXTRA),TRUE) +$(eval $(call gb_Library_add_exception_objects,cui,\ +cui/source/dialogs/hyphen \ +)) +endif + $(eval $(call gb_Library_add_exception_objects,cui,\ cui/source/customize/acccfg \ cui/source/customize/cfg \ @@ -132,7 +138,6 @@ $(eval $(call gb_Library_add_exception_objects,cui,\ cui/source/dialogs/hlmailtp \ cui/source/dialogs/hlmarkwn \ cui/source/dialogs/hltpbase \ -cui/source/dialogs/hyphen \ cui/source/dialogs/iconcdlg \ cui/source/dialogs/insdlg \ cui/source/dialogs/insrc \ diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx index 4b3fa290fbeb..7c1dce6e2e35 1006
[Libreoffice-commits] help.git: source/text
source/text/sbasic/shared/0302.xhp | 25 +++-- source/text/sbasic/shared/03020401.xhp | 32 source/text/sbasic/shared/03020402.xhp | 17 +++-- source/text/sbasic/shared/03020403.xhp | 27 --- 4 files changed, 62 insertions(+), 39 deletions(-) New commits: commit bd3e4888b2b47d022871218f210b290b7d046288 Author: Rafael Lima AuthorDate: Thu May 13 01:00:26 2021 +0200 Commit: Alain Romedenne CommitDate: Thu May 20 18:24:15 2021 +0200 Related tdf#128784 X-ref ChDir, ChDrive and CurDir with SF_FileSystem The Basic functions ChDir, ChDrive and CurDir are DOS-specific and have limited functionality. Hence, it's important to introduce the FileSystem service (from ScriptForge) for users that wish to write scripts that need to handle folders and files. Change-Id: I33e24669083887b540cf44711ec5114e6ae5c521 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/115513 Tested-by: Jenkins Reviewed-by: Alain Romedenne diff --git a/source/text/sbasic/shared/0302.xhp b/source/text/sbasic/shared/0302.xhp index 38336c7fa..e036d774f 100644 --- a/source/text/sbasic/shared/0302.xhp +++ b/source/text/sbasic/shared/0302.xhp @@ -18,25 +18,30 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> - + - -File I/O Functions -/text/sbasic/shared/0302.xhp - - -Sun Microsystems, Inc. - + +File I/O Functions +/text/sbasic/shared/0302.xhp + + +Sun Microsystems, Inc. + -File I/O Functions -Use File I/O functions to create and manage user-defined (data) files. + File I/O Functions + Use File I/O functions to create and manage user-defined (data) files. You can use these functions to support the creation of "relative" files, so that you can save and reload certain records by specifying their record number. File I/O functions can also help you manage your files by providing you with information such as file size, current path settings, or the creation date of a file or a directory. + + + + + diff --git a/source/text/sbasic/shared/03020401.xhp b/source/text/sbasic/shared/03020401.xhp index 220fb4d8d..42f721d4d 100644 --- a/source/text/sbasic/shared/03020401.xhp +++ b/source/text/sbasic/shared/03020401.xhp @@ -37,7 +37,11 @@ -Some DOS-specific file and directory functions are no longer provided in %PRODUCTNAME, or their function is only limited. For example, support for the ChDir, ChDrive and CurDir functions is not provided. Some DOS-specific properties are no longer used in functions that expect file properties as parameters (for example, to differentiate from concealed files and system files). This ensures the greatest possible level of platform independence for %PRODUCTNAME. Therefore this feature is subject to removal in a future release. + Some DOS-specific file and directory functions are no longer provided in %PRODUCTNAME, or their function is only limited. For example, support for the ChDir, ChDrive and CurDir functions is not provided. Some DOS-specific properties are no longer used in functions that expect file properties as parameters (for example, to differentiate from concealed files and system files). This ensures the greatest possible level of platform independence for %PRODUCTNAME. Therefore this feature is subject to removal in a future release. + + + + The ScriptForge library in %PRODUCTNAME 7.1 introduces the FileSystem service with methods to handle files and folders in user scripts. @@ -51,19 +55,23 @@ - + -Sub ExampleChDir -Dim sDir1 As String , sDir2 As String -sDir1 = "c:\Test" -sDir2 = "d:\Private" -ChDir( sDir1 ) -MsgBox CurDir -ChDir( sDir2 ) -MsgBox CurDir -End Sub + Sub ExampleChDir + Dim sDir1 As String, sDir2 As String + sDir1 = "C:\Test" + sDir2 = "D:\Private" + ChDir( sDir1 ) + MsgBox CurDir + ChDir( sDir2 ) + MsgBox CurDir + End Sub - + + + + + diff --git a/source/text/sbasic/shared/03020402.xhp b/source/text/sbasic/shared/03020402.xhp index 59f89e055..780f9e204 100644 --- a/source/text/sbasic/shared/03020402.xhp +++ b/source/text/sbasic/shared/03020402.xhp @@ -36,10 +36,11 @@ Changes the current drive. + -ChDrive Text As String + ChDrive Text As String @@ -52,10 +53,14 @@ -Sub ExampleChDrive -ChDrive "D" ' Only possible if a drive 'D' exists. -End Sub + Sub ExampleChDrive + ChDrive "D" ' Only possible if a drive 'D' exists. + End Sub - - \ No newline at end of file + + + + + + diff --git a/source/text/sbasic/shared/03020403.xhp b/source/text/sbasic/shared/03020403.xhp index af7c1b381..0929218d7 100644 --- a/source/text/sbasic/shared/03020403.xhp +++ b/source/text/sbasic/shared/03020403.xhp @@ -36
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 27c89d6db49855ffad5ec38bb4842f5d30b42a05 Author: Rafael Lima AuthorDate: Thu May 20 18:24:15 2021 +0200 Commit: Gerrit Code Review CommitDate: Thu May 20 18:24:15 2021 +0200 Update git submodules * Update helpcontent2 from branch 'master' to bd3e4888b2b47d022871218f210b290b7d046288 - Related tdf#128784 X-ref ChDir, ChDrive and CurDir with SF_FileSystem The Basic functions ChDir, ChDrive and CurDir are DOS-specific and have limited functionality. Hence, it's important to introduce the FileSystem service (from ScriptForge) for users that wish to write scripts that need to handle folders and files. Change-Id: I33e24669083887b540cf44711ec5114e6ae5c521 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/115513 Tested-by: Jenkins Reviewed-by: Alain Romedenne diff --git a/helpcontent2 b/helpcontent2 index 6eca503da7d0..bd3e4888b2b4 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 6eca503da7d03e8446f2ea9477fd6cdca735f6f1 +Subproject commit bd3e4888b2b47d022871218f210b290b7d046288 ___ 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/view/cellsh.cxx |3 ++-
sc/source/ui/view/viewfunc.cxx |3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
New commits:
commit a2c4a033d49c23d20761b2881135ec3a72f25b01
Author: Tünde Tóth
AuthorDate: Tue May 11 11:21:35 2021 +0200
Commit: László Németh
CommitDate: Thu May 20 18:08:31 2021 +0200
tdf#57351 sc UI: fix disabled Insert Columns options
In a sheet with active autofilter or standard filter,
Insert Columns Before/After weren't available in the
context menu of the column header and in Sheet->Insert
Columns...
Change-Id: I746d7d5a451848306d67d57e42d3981c471c66f2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115400
Tested-by: László Németh
Reviewed-by: László Németh
diff --git a/sc/source/ui/view/cellsh.cxx b/sc/source/ui/view/cellsh.cxx
index 256cab898a35..9bf5286c8d7c 100644
--- a/sc/source/ui/view/cellsh.cxx
+++ b/sc/source/ui/view/cellsh.cxx
@@ -256,7 +256,8 @@ void ScCellShell::GetBlockState( SfxItemSet& rSet )
if (nWhich == FID_INS_COLUMNS_AFTER)
eAction = sc::ColRowEditAction::InsertColumnsAfter;
-bDisable = (!bSimpleArea) || GetViewData().SimpleRowMarked();
+bDisable = (!bSimpleArea && eMarkType !=
SC_MARK_SIMPLE_FILTERED)
+ || GetViewData().SimpleRowMarked();
if (!bEditable && nRow1 == 0 && nRow2 == rDoc.MaxRow())
{
// See if row insertions are allowed.
diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx
index 73363238a85a..a4c5c6db55a7 100644
--- a/sc/source/ui/view/viewfunc.cxx
+++ b/sc/source/ui/view/viewfunc.cxx
@@ -1599,7 +1599,8 @@ void ScViewFunc::OnLOKSetWidthOrHeight(SCCOLROW nStart,
bool bWidth)
bool ScViewFunc::InsertCells( InsCellCmd eCmd, bool bRecord, bool bPartOfPaste
)
{
ScRange aRange;
-if (GetViewData().GetSimpleArea(aRange) == SC_MARK_SIMPLE)
+ScMarkType eMarkType = GetViewData().GetSimpleArea(aRange);
+if (eMarkType == SC_MARK_SIMPLE || eMarkType == SC_MARK_SIMPLE_FILTERED)
{
ScDocShell* pDocSh = GetViewData().GetDocShell();
const ScMarkData& rMark = GetViewData().GetMarkData();
___
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/ui/dbui/dbinsdlg.cxx| 16 +---
sw/source/uibase/inc/dbinsdlg.hxx |2 +-
2 files changed, 6 insertions(+), 12 deletions(-)
New commits:
commit f7aca9ed4533f202e87141ca7a65d9949a36c9a1
Author: Caolán McNamara
AuthorDate: Thu May 20 14:39:56 2021 +0100
Commit: Caolán McNamara
CommitDate: Thu May 20 17:31:26 2021 +0200
HeaderHdl only does something for the m_xCbTableHeadon case
drop the others
Change-Id: Ibc07996ada54437c44201cb32f70bd594dd4a202
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115878
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx
index a48dfeea4726..1f19a0884273 100644
--- a/sw/source/ui/dbui/dbinsdlg.cxx
+++ b/sw/source/ui/dbui/dbinsdlg.cxx
@@ -354,9 +354,7 @@ SwInsertDBColAutoPilot::SwInsertDBColAutoPilot( SwView&
rView,
m_xIbDbcolAllFrom->connect_clicked( LINK(this, SwInsertDBColAutoPilot,
TableToFromHdl ));
m_xIbDbcolToEdit->connect_clicked( LINK(this, SwInsertDBColAutoPilot,
TableToFromHdl ));
-m_xCbTableHeadon->connect_clicked( LINK(this, SwInsertDBColAutoPilot,
HeaderHdl ));
-m_xRbHeadlColnms->connect_clicked( LINK(this, SwInsertDBColAutoPilot,
HeaderHdl ));
-m_xRbHeadlEmpty->connect_clicked( LINK(this, SwInsertDBColAutoPilot,
HeaderHdl ));
+m_xCbTableHeadon->connect_toggled( LINK(this, SwInsertDBColAutoPilot,
HeaderHdl ));
m_xLbTextDbColumn->connect_changed( LINK( this, SwInsertDBColAutoPilot,
TVSelectHdl ));
m_xLbTableDbColumn->connect_changed( LINK( this, SwInsertDBColAutoPilot,
TVSelectHdl ));
@@ -797,15 +795,11 @@ IMPL_LINK_NOARG(SwInsertDBColAutoPilot, CBSelectHdl,
weld::ComboBox&, void)
}
}
-IMPL_LINK( SwInsertDBColAutoPilot, HeaderHdl, weld::Button&, rButton, void )
+IMPL_LINK_NOARG(SwInsertDBColAutoPilot, HeaderHdl, weld::ToggleButton&, void)
{
-if (&rButton == m_xCbTableHeadon.get())
-{
-bool bEnable = m_xCbTableHeadon->get_active();
-
-m_xRbHeadlColnms->set_sensitive( bEnable );
-m_xRbHeadlEmpty->set_sensitive( bEnable );
-}
+bool bEnable = m_xCbTableHeadon->get_active();
+m_xRbHeadlColnms->set_sensitive( bEnable );
+m_xRbHeadlEmpty->set_sensitive( bEnable );
}
static void lcl_InsTextInArr( const OUString& rText, DB_Columns& rColArr )
diff --git a/sw/source/uibase/inc/dbinsdlg.hxx
b/sw/source/uibase/inc/dbinsdlg.hxx
index 0dc715d1c6fd..2d3206331e2f 100644
--- a/sw/source/uibase/inc/dbinsdlg.hxx
+++ b/sw/source/uibase/inc/dbinsdlg.hxx
@@ -131,7 +131,7 @@ class SwInsertDBColAutoPilot : public SfxDialogController,
public utl::ConfigIte
DECL_LINK( TVSelectHdl, weld::TreeView&, void );
DECL_LINK( CBSelectHdl, weld::ComboBox&, void );
DECL_LINK( DblClickHdl, weld::TreeView&, bool );
-DECL_LINK( HeaderHdl, weld::Button&, void );
+DECL_LINK( HeaderHdl, weld::ToggleButton&, void );
bool SplitTextToColArr( const OUString& rText, DB_Columns& rColArr, bool
bInsField );
virtual void Notify( const css::uno::Sequence< OUString >& aPropertyNames
) override;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source sd/source sw/source
sc/source/ui/dbgui/scuiasciiopt.cxx | 24
sc/source/ui/dbgui/tpsubt.cxx | 10 +-
sc/source/ui/inc/delcodlg.hxx |2 +-
sc/source/ui/inc/linkarea.hxx |2 +-
sc/source/ui/inc/mtrindlg.hxx |2 +-
sc/source/ui/inc/scuiasciiopt.hxx |2 +-
sc/source/ui/inc/tpsubt.hxx |4 ++--
sc/source/ui/miscdlgs/delcodlg.cxx |4 ++--
sc/source/ui/miscdlgs/linkarea.cxx |4 ++--
sc/source/ui/miscdlgs/mtrindlg.cxx |4 ++--
sd/source/filter/html/pubdlg.cxx|4 ++--
sd/source/ui/inc/pubdlg.hxx |2 +-
sw/source/ui/config/optpage.cxx | 32
sw/source/ui/misc/linenum.cxx |4 ++--
sw/source/uibase/inc/linenum.hxx|2 +-
sw/source/uibase/inc/optpage.hxx|4 ++--
16 files changed, 53 insertions(+), 53 deletions(-)
New commits:
commit 48182506886230a70cfa2ce3c61470701cb1138e
Author: Caolán McNamara
AuthorDate: Thu May 20 13:00:44 2021 +0100
Commit: Caolán McNamara
CommitDate: Thu May 20 17:01:53 2021 +0200
use toggle instead of click for CheckButton
Change-Id: Ic8957a59addbf08f2b2e4e84167991f00048c6a5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115876
Tested-by: Caolán McNamara
Reviewed-by: Caolán McNamara
diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx
b/sc/source/ui/dbgui/scuiasciiopt.cxx
index 40d86b908de0..34cedba0824c 100644
--- a/sc/source/ui/dbgui/scuiasciiopt.cxx
+++ b/sc/source/ui/dbgui/scuiasciiopt.cxx
@@ -431,18 +431,18 @@ ScImportAsciiDlg::ScImportAsciiDlg(weld::Window* pParent,
const OUString& aDatNa
lcl_FillCombo( *mxCbTextSep, gaTextSepList, mcTextSep );
mxCbTextSep->set_entry_text(sTextSeparators);
-Link aSeparatorClickHdl =LINK( this, ScImportAsciiDlg,
SeparatorClickHdl );
+Link aSeparatorClickHdl =LINK( this,
ScImportAsciiDlg, SeparatorClickHdl );
mxCbTextSep->connect_changed( LINK( this, ScImportAsciiDlg,
SeparatorComboBoxHdl ) );
-mxCkbTab->connect_clicked( aSeparatorClickHdl );
-mxCkbSemicolon->connect_clicked( aSeparatorClickHdl );
-mxCkbComma->connect_clicked( aSeparatorClickHdl );
-mxCkbAsOnce->connect_clicked( aSeparatorClickHdl );
-mxCkbQuotedAsText->connect_clicked( aSeparatorClickHdl );
-mxCkbDetectNumber->connect_clicked( aSeparatorClickHdl );
-mxCkbSkipEmptyCells->connect_clicked( aSeparatorClickHdl );
-mxCkbSpace->connect_clicked( aSeparatorClickHdl );
-mxCkbRemoveSpace->connect_clicked( aSeparatorClickHdl );
-mxCkbOther->connect_clicked( aSeparatorClickHdl );
+mxCkbTab->connect_toggled( aSeparatorClickHdl );
+mxCkbSemicolon->connect_toggled( aSeparatorClickHdl );
+mxCkbComma->connect_toggled( aSeparatorClickHdl );
+mxCkbAsOnce->connect_toggled( aSeparatorClickHdl );
+mxCkbQuotedAsText->connect_toggled( aSeparatorClickHdl );
+mxCkbDetectNumber->connect_toggled( aSeparatorClickHdl );
+mxCkbSkipEmptyCells->connect_toggled( aSeparatorClickHdl );
+mxCkbSpace->connect_toggled( aSeparatorClickHdl );
+mxCkbRemoveSpace->connect_toggled( aSeparatorClickHdl );
+mxCkbOther->connect_toggled( aSeparatorClickHdl );
mxEdOther->connect_changed(LINK(this, ScImportAsciiDlg, SeparatorEditHdl));
// *** text encoding ListBox ***
@@ -709,7 +709,7 @@ IMPL_LINK(ScImportAsciiDlg, RbSepFixHdl, weld::Button&,
rButton, void)
}
}
-IMPL_LINK(ScImportAsciiDlg, SeparatorClickHdl, weld::Button&, rCtrl, void)
+IMPL_LINK(ScImportAsciiDlg, SeparatorClickHdl, weld::ToggleButton&, rCtrl,
void)
{
SeparatorHdl(&rCtrl);
}
diff --git a/sc/source/ui/dbgui/tpsubt.cxx b/sc/source/ui/dbgui/tpsubt.cxx
index 9ece3597bb50..57b34a9b09f9 100644
--- a/sc/source/ui/dbgui/tpsubt.cxx
+++ b/sc/source/ui/dbgui/tpsubt.cxx
@@ -82,7 +82,7 @@ void ScTpSubTotalGroup::Init()
mxLbColumns->connect_changed( LINK( this, ScTpSubTotalGroup,
SelectTreeListBoxHdl ) );
mxLbColumns->connect_toggled( LINK( this, ScTpSubTotalGroup, CheckHdl ) );
mxLbFunctions->connect_changed( LINK( this, ScTpSubTotalGroup,
SelectTreeListBoxHdl) );
-mxLbSelectAllColumns->connect_clicked( LINK( this, ScTpSubTotalGroup,
CheckBoxHdl ) );
+mxLbSelectAllColumns->connect_toggled( LINK( this, ScTpSubTotalGroup,
CheckBoxHdl ) );
mnFieldArr.resize(SC_MAXFIELDS(pDoc->GetSheetLimits()));
mnFieldArr[0] = 0;
@@ -470,8 +470,8 @@ void ScTpSubTotalOptions::Init()
pDoc = &pViewData->GetDocument();
assert(pDoc && "Document not found!");
-m_xBtnSort->connect_clicked( LINK( this, ScTpSubTotalOptions, CheckHdl ) );
-m_xBtnUserDef->connect_clicked( LINK( this, ScTpSubTotalOptions, CheckHdl
) );
+m_xBtnSort->connect_toggled( LINK( this, ScTpSubTotalOptions, CheckHdl ) );
+m_xBtnUserDef->connect_toggled( LINK( this, ScTpSubTotalOptions, CheckHdl
) );
FillUserSortListBox();
}
@@ -551,7 +551,7 @@ void ScTpSubTotalOptions::FillUserSortListBox()
// Handler:
-IMPL_LINK(ScTpSubT
[Libreoffice-commits] core.git: sc/source sw/source
sc/source/ui/dbgui/dpgroupdlg.cxx | 16 +---
sc/source/ui/dbgui/pvfundlg.cxx | 25 +++--
sc/source/ui/dbgui/scuiasciiopt.cxx | 30 +-
sc/source/ui/inc/dpgroupdlg.hxx |2 +-
sc/source/ui/inc/instbdlg.hxx |2 +-
sc/source/ui/inc/pvfundlg.hxx |4 ++--
sc/source/ui/inc/scuiasciiopt.hxx |3 ++-
sc/source/ui/inc/tpcalc.hxx |2 +-
sc/source/ui/inc/tpformula.hxx |1 +
sc/source/ui/miscdlgs/instbdlg.cxx |9 ++---
sc/source/ui/optdlg/tpcalc.cxx | 16 +---
sc/source/ui/optdlg/tpformula.cxx | 20 ++--
sw/source/ui/config/optpage.cxx | 13 -
sw/source/ui/fldui/javaedit.cxx | 21 ++---
sw/source/uibase/inc/javaedit.hxx |3 ++-
sw/source/uibase/inc/optpage.hxx|2 +-
16 files changed, 103 insertions(+), 66 deletions(-)
New commits:
commit 253f7af7bcd2337a06c027852286616ff91d2e3f
Author: Caolán McNamara
AuthorDate: Thu May 20 12:56:31 2021 +0100
Commit: Caolán McNamara
CommitDate: Thu May 20 17:02:12 2021 +0200
use toggle instead of click for RadioButton
Change-Id: Ia43c3ccae0dcbfb0c522a8c13db6fbfb72bfa4f8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115877
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/sc/source/ui/dbgui/dpgroupdlg.cxx
b/sc/source/ui/dbgui/dpgroupdlg.cxx
index f86199f1acc2..d260b4337680 100644
--- a/sc/source/ui/dbgui/dpgroupdlg.cxx
+++ b/sc/source/ui/dbgui/dpgroupdlg.cxx
@@ -233,7 +233,7 @@ ScDPDateGroupDlg::ScDPDateGroupDlg(weld::Window* pParent,
if( rInfo.mbDateValues )
{
mxRbNumDays->set_active(true);
-ClickHdl(*mxRbNumDays );
+ToggleHdl(*mxRbNumDays );
double fNumDays = rInfo.mfStep;
if( fNumDays < 1.0 )
@@ -245,7 +245,7 @@ ScDPDateGroupDlg::ScDPDateGroupDlg(weld::Window* pParent,
else
{
mxRbUnits->set_active(true);
-ClickHdl(*mxRbUnits);
+ToggleHdl(*mxRbUnits);
}
/* Set the initial focus, currently it is somewhere after calling all the
radio
@@ -259,8 +259,8 @@ ScDPDateGroupDlg::ScDPDateGroupDlg(weld::Window* pParent,
else if( mxLbUnits->get_sensitive() )
mxLbUnits->grab_focus();
-mxRbNumDays->connect_clicked( LINK( this, ScDPDateGroupDlg, ClickHdl ) );
-mxRbUnits->connect_clicked( LINK( this, ScDPDateGroupDlg, ClickHdl ) );
+mxRbNumDays->connect_toggled( LINK( this, ScDPDateGroupDlg, ToggleHdl ) );
+mxRbUnits->connect_toggled( LINK( this, ScDPDateGroupDlg, ToggleHdl ) );
mxLbUnits->connect_toggled( LINK( this, ScDPDateGroupDlg, CheckHdl ) );
}
@@ -302,9 +302,11 @@ sal_Int32 ScDPDateGroupDlg::GetDatePart() const
return nDatePart;
}
-IMPL_LINK(ScDPDateGroupDlg, ClickHdl, weld::Button&, rButton, void)
+IMPL_LINK(ScDPDateGroupDlg, ToggleHdl, weld::ToggleButton&, rButton, void)
{
-if (&rButton == mxRbNumDays.get())
+if (!rButton.get_active())
+return;
+if (mxRbNumDays->get_active())
{
mxLbUnits->set_sensitive(false);
// enable and set focus to edit field on clicking "num of days" radio
button
@@ -312,7 +314,7 @@ IMPL_LINK(ScDPDateGroupDlg, ClickHdl, weld::Button&,
rButton, void)
mxEdNumDays->grab_focus();
mxBtnOk->set_sensitive(true);
}
-else if (&rButton == mxRbUnits.get())
+else if (mxRbUnits->get_active())
{
mxEdNumDays->set_sensitive(false);
// enable and set focus to listbox on clicking "units" radio button
diff --git a/sc/source/ui/dbgui/pvfundlg.cxx b/sc/source/ui/dbgui/pvfundlg.cxx
index 43f4e33274a1..6c1e006ecbc5 100644
--- a/sc/source/ui/dbgui/pvfundlg.cxx
+++ b/sc/source/ui/dbgui/pvfundlg.cxx
@@ -527,9 +527,9 @@ void ScDPSubtotalDlg::Init( const ScDPLabelData&
rLabelData, const ScPivotFuncDa
mxFtName->set_label(rLabelData.getDisplayName());
// radio buttons
-mxRbNone->connect_clicked( LINK( this, ScDPSubtotalDlg, RadioClickHdl ) );
-mxRbAuto->connect_clicked( LINK( this, ScDPSubtotalDlg, RadioClickHdl ) );
-mxRbUser->connect_clicked( LINK( this, ScDPSubtotalDlg, RadioClickHdl ) );
+mxRbNone->connect_toggled( LINK( this, ScDPSubtotalDlg, RadioClickHdl ) );
+mxRbAuto->connect_toggled( LINK( this, ScDPSubtotalDlg, RadioClickHdl ) );
+mxRbUser->connect_toggled( LINK( this, ScDPSubtotalDlg, RadioClickHdl ) );
weld::RadioButton* pRBtn = nullptr;
switch( rFuncData.mnFuncMask )
@@ -562,9 +562,11 @@ IMPL_LINK(ScDPSubtotalDlg, ButtonClicked, weld::Button&,
rButton, void)
response(RET_CANCEL);
}
-IMPL_LINK(ScDPSubtotalDlg, RadioClickHdl, weld::Button&, rBtn, void)
+IMPL_LINK(ScDPSubtotalDlg, RadioClickHdl, weld::ToggleButton&, rBtn, void)
{
-mxLbFunc->set_sensitive(&rBtn == mxRbUser.get());
+if (!rBtn.get_active())
+return;
+mxLbFunc->set_sensitive(mxRbUser->get_active());
}
IMPL_LINK
[Libreoffice-commits] core.git: dbaccess/source sc/source sd/source
dbaccess/source/ui/dlg/generalpage.cxx | 10 ++
dbaccess/source/ui/dlg/generalpage.hxx |2 +-
sc/source/ui/dbgui/dpgroupdlg.cxx | 17 ++---
sc/source/ui/inc/dpgroupdlg.hxx|2 +-
sd/source/ui/dlg/animobjs.cxx |6 +++---
sd/source/ui/inc/animobjs.hxx |2 +-
6 files changed, 22 insertions(+), 17 deletions(-)
New commits:
commit 3cf28a1ab93515739e9fd20ffb3a575017ac9e69
Author: Caolán McNamara
AuthorDate: Thu May 20 11:00:26 2021 +0100
Commit: Caolán McNamara
CommitDate: Thu May 20 17:01:32 2021 +0200
use toggle instead of click for RadioButton
Change-Id: Icacf5444d65fb5bac4a6c85d9e5c36b98da3e57a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115867
Tested-by: Caolán McNamara
Reviewed-by: Caolán McNamara
diff --git a/dbaccess/source/ui/dlg/generalpage.cxx
b/dbaccess/source/ui/dlg/generalpage.cxx
index 5de35c10c539..f9a8ebb4902c 100644
--- a/dbaccess/source/ui/dlg/generalpage.cxx
+++ b/dbaccess/source/ui/dlg/generalpage.cxx
@@ -484,9 +484,9 @@ namespace dbaui
// do some knittings
m_xEmbeddedDBType->connect_changed(LINK(this, OGeneralPageWizard,
OnEmbeddedDBTypeSelected));
-m_xRB_CreateDatabase->connect_clicked( LINK( this, OGeneralPageWizard,
OnSetupModeSelected ) );
-m_xRB_ConnectDatabase->connect_clicked( LINK( this,
OGeneralPageWizard, OnSetupModeSelected ) );
-m_xRB_OpenExistingDatabase->connect_clicked( LINK( this,
OGeneralPageWizard, OnSetupModeSelected ) );
+m_xRB_CreateDatabase->connect_toggled( LINK( this, OGeneralPageWizard,
OnSetupModeSelected ) );
+m_xRB_ConnectDatabase->connect_toggled( LINK( this,
OGeneralPageWizard, OnSetupModeSelected ) );
+m_xRB_OpenExistingDatabase->connect_toggled( LINK( this,
OGeneralPageWizard, OnSetupModeSelected ) );
m_xLB_DocumentList->connect_changed( LINK( this, OGeneralPageWizard,
OnDocumentSelected ) );
m_xPB_OpenDatabase->connect_clicked( LINK( this, OGeneralPageWizard,
OnOpenDocument ) );
m_xFT_NoEmbeddedDBLabel->hide();
@@ -647,8 +647,10 @@ namespace dbaui
EnableControls();
}
-IMPL_LINK_NOARG( OGeneralPageWizard, OnSetupModeSelected, weld::Button&,
void )
+IMPL_LINK(OGeneralPageWizard, OnSetupModeSelected, weld::ToggleButton&,
rButton, void)
{
+if (!rButton.get_active())
+return;
SetupModeSelected();
}
diff --git a/dbaccess/source/ui/dlg/generalpage.hxx
b/dbaccess/source/ui/dlg/generalpage.hxx
index 810fd44d0682..461161195eef 100644
--- a/dbaccess/source/ui/dlg/generalpage.hxx
+++ b/dbaccess/source/ui/dlg/generalpage.hxx
@@ -179,7 +179,7 @@ namespace dbaui
void SetupModeSelected();
DECL_LINK( OnEmbeddedDBTypeSelected, weld::ComboBox&, void );
-DECL_LINK( OnSetupModeSelected, weld::Button&, void );
+DECL_LINK( OnSetupModeSelected, weld::ToggleButton&, void );
DECL_LINK( OnDocumentSelected, weld::ComboBox&, void );
DECL_LINK( OnOpenDocument, weld::Button&, void );
};
diff --git a/sc/source/ui/dbgui/dpgroupdlg.cxx
b/sc/source/ui/dbgui/dpgroupdlg.cxx
index 64d61e55bbab..f86199f1acc2 100644
--- a/sc/source/ui/dbgui/dpgroupdlg.cxx
+++ b/sc/source/ui/dbgui/dpgroupdlg.cxx
@@ -61,8 +61,8 @@ ScDPGroupEditHelper::ScDPGroupEditHelper(weld::RadioButton&
rRbAuto, weld::Radio
, mrRbMan(rRbMan)
, mrEdValue(rEdValue)
{
-mrRbAuto.connect_clicked( LINK( this, ScDPGroupEditHelper, ClickHdl ) );
-mrRbMan.connect_clicked( LINK( this, ScDPGroupEditHelper, ClickHdl ) );
+mrRbAuto.connect_toggled( LINK( this, ScDPGroupEditHelper, ToggleHdl ) );
+mrRbMan.connect_toggled( LINK( this, ScDPGroupEditHelper, ToggleHdl ) );
}
bool ScDPGroupEditHelper::IsAuto() const
@@ -83,24 +83,27 @@ void ScDPGroupEditHelper::SetValue( bool bAuto, double
fValue )
if( bAuto )
{
mrRbAuto.set_active(true);
-ClickHdl(mrRbAuto);
+ToggleHdl(mrRbAuto);
}
else
{
mrRbMan.set_active(true);
-ClickHdl(mrRbMan);
+ToggleHdl(mrRbMan);
}
ImplSetValue( fValue );
}
-IMPL_LINK(ScDPGroupEditHelper, ClickHdl, weld::Button&, rButton, void)
+IMPL_LINK(ScDPGroupEditHelper, ToggleHdl, weld::ToggleButton&, rButton, void)
{
-if (&rButton == &mrRbAuto)
+if (!rButton.get_active())
+return;
+
+if (mrRbAuto.get_active())
{
// disable edit field on clicking "automatic" radio button
mrEdValue.set_sensitive(false);
}
-else if (&rButton == &mrRbMan)
+else if (mrRbMan.get_active())
{
// enable and set focus to edit field on clicking "manual" radio button
mrEdValue.set_sensitive(true);
diff --git a/sc/source/ui/inc/dpgroupdlg.hxx b/sc/source/ui/inc/dpgroupdlg.hxx
index 79bbe7dccbd3..c0c19b8a9558 100644
--- a/sc/source/ui/inc/dpgroupdlg.hxx
+++ b/sc/source/ui/inc/dpgroupdlg.hxx
@@ -43,7 +43,7 @@ private:
[Libreoffice-commits] core.git: toolkit/source
toolkit/source/awt/vclxwindow.cxx | 15 +--
1 file changed, 13 insertions(+), 2 deletions(-)
New commits:
commit dbd45a00db54af7d960654932ef17eba4ef457ca
Author: Noel Grandin
AuthorDate: Thu May 20 13:23:52 2021 +0200
Commit: Noel Grandin
CommitDate: Thu May 20 16:47:10 2021 +0200
fix VCLXWindow related leaks
Change-Id: If2c0a599bdfed4c5390c4d3628157c7d942d5cf8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115870
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/toolkit/source/awt/vclxwindow.cxx
b/toolkit/source/awt/vclxwindow.cxx
index 215fdbaf2d88..80e9db718500 100644
--- a/toolkit/source/awt/vclxwindow.cxx
+++ b/toolkit/source/awt/vclxwindow.cxx
@@ -220,6 +220,11 @@ VCLXWindowImpl::VCLXWindowImpl( VCLXWindow& _rAntiImpl,
bool _bWithDefaultProps
void VCLXWindowImpl::disposing()
{
SolarMutexGuard aGuard;
+
+assert(!mbDisposed);
+
+mbDisposed = true;
+
if ( mnCallbackEventId )
{
Application::RemoveUserEvent( mnCallbackEventId );
@@ -227,8 +232,7 @@ void VCLXWindowImpl::disposing()
// we acquired our VCLXWindow once before posting the event, release
this one ref now
mrAntiImpl.release();
}
-
-mbDisposed = true;
+maCallbackEvents.clear();
css::lang::EventObject aEvent;
aEvent.Source = mrAntiImpl;
@@ -243,6 +247,7 @@ void VCLXWindowImpl::disposing()
maPaintListeners.disposeAndClear( aEvent );
maContainerListeners.disposeAndClear( aEvent );
maTopWindowListeners.disposeAndClear( aEvent );
+maWindow2Listeners.disposeAndClear( aEvent );
::toolkit::WindowStyleSettings* pStyleSettings = static_cast<
::toolkit::WindowStyleSettings* >( mxWindowStyleSettings.get() );
if ( pStyleSettings != nullptr )
@@ -334,6 +339,8 @@ VCLXWindow::~VCLXWindow()
void VCLXWindow::ImplExecuteAsyncWithoutSolarLock( const Callback& i_callback )
{
+if (mpImpl->mbDisposing)
+return;
mpImpl->callBackAsync( i_callback );
}
@@ -345,6 +352,8 @@ void VCLXWindow::ImplExecuteAsyncWithoutSolarLock( const
Callback& i_callback )
void VCLXWindow::SetWindow( const VclPtr &pWindow )
{
+assert(!mpImpl->mbDisposing || !pWindow);
+
if ( GetWindow() )
{
GetWindow()->RemoveEventListener( LINK( this, VCLXWindow,
WindowEventListener ) );
@@ -416,6 +425,8 @@ namespace
void VCLXWindow::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent )
{
+if (mpImpl->mbDisposing)
+return;
css::uno::Reference< css::uno::XInterface > xThis(
static_cast(this) );
switch ( rVclWindowEvent.GetId() )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/wasm' - config_host.mk.in lingucomponent/Library_guesslang.mk lingucomponent/Module_lingucomponent.mk postprocess/Rdb_services.mk Repository.mk solenv/b
Repository.mk |7 ++-
config_host.mk.in |1 +
lingucomponent/Library_guesslang.mk |7 ++-
lingucomponent/Module_lingucomponent.mk |5 +
postprocess/Rdb_services.mk |7 ++-
solenv/bin/native-code.py |4 ++--
solenv/gbuild/gbuild.mk |1 +
7 files changed, 27 insertions(+), 5 deletions(-)
New commits:
commit 302a6f6f777a1394e439807f3ef034e7edc45682
Author: Armin Le Grand (Allotropia)
AuthorDate: Thu May 20 16:45:26 2021 +0200
Commit: Armin Le Grand (Allotropia)
CommitDate: Thu May 20 16:45:26 2021 +0200
Wasm LanguageGuess optional removal
Change-Id: Ida6a6357be9a92c473c292142575c9e111c33cca
diff --git a/Repository.mk b/Repository.mk
index 7a58afee5cf9..700d61a2e55a 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -359,6 +359,12 @@ $(eval $(call
gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
))
endif
+ifneq ($(ENABLE_WASM_STRIP_GUESSLANG),TRUE)
+$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
+ guesslang \
+))
+endif
+
$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
$(call gb_Helper_optional,AVMEDIA,avmedia) \
$(if $(filter MACOSX,$(OS)),\
@@ -401,7 +407,6 @@ $(eval $(call
gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
frm \
fsstorage \
fwk \
- guesslang \
i18npool \
i18nsearch \
hyphen \
diff --git a/config_host.mk.in b/config_host.mk.in
index 59acfac79a55..f723a6559a1e 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -214,6 +214,7 @@ export ENABLE_WASM_STRIP_ACCESSIBILITY=@ENABLE_WASM_STRIP@
export ENABLE_WASM_STRIP_UCPHELP=@ENABLE_WASM_STRIP@
export ENABLE_WASM_STRIP_EPUB=@ENABLE_WASM_STRIP@
export ENABLE_WASM_STRIP_LOCALES=@ENABLE_WASM_STRIP@
+export ENABLE_WASM_STRIP_GUESSLANG=@ENABLE_WASM_STRIP@
export ENABLE_WERROR=@ENABLE_WERROR@
export ENDIANNESS=@ENDIANNESS@
export EPM=@EPM@
diff --git a/lingucomponent/Library_guesslang.mk
b/lingucomponent/Library_guesslang.mk
index 55f9225722a5..3363e6aa1831 100644
--- a/lingucomponent/Library_guesslang.mk
+++ b/lingucomponent/Library_guesslang.mk
@@ -12,10 +12,15 @@ $(eval $(call gb_Library_Library,guesslang))
$(eval $(call
gb_Library_set_componentfile,guesslang,lingucomponent/source/languageguessing/guesslang))
+ifneq ($(ENABLE_WASM_STRIP_GUESSLANG),TRUE)
$(eval $(call gb_Library_use_externals,guesslang,\
- boost_headers \
libexttextcat \
))
+endif
+
+$(eval $(call gb_Library_use_externals,guesslang,\
+ boost_headers \
+))
$(eval $(call gb_Library_use_sdk_api,guesslang))
diff --git a/lingucomponent/Module_lingucomponent.mk
b/lingucomponent/Module_lingucomponent.mk
index 2bde5d5391e5..1a22d9bbf143 100644
--- a/lingucomponent/Module_lingucomponent.mk
+++ b/lingucomponent/Module_lingucomponent.mk
@@ -10,8 +10,13 @@
$(eval $(call gb_Module_Module,lingucomponent))
+ifneq ($(ENABLE_WASM_STRIP_GUESSLANG),TRUE)
$(eval $(call gb_Module_add_targets,lingucomponent,\
Library_guesslang \
+))
+endif
+
+$(eval $(call gb_Module_add_targets,lingucomponent,\
Library_hyphen \
Library_lnth \
$(if $(filter iOS MACOSX,$(OS)),Library_MacOSXSpell) \
diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
index 85cf66a93073..be2cb9d54225 100644
--- a/postprocess/Rdb_services.mk
+++ b/postprocess/Rdb_services.mk
@@ -97,6 +97,12 @@ $(eval $(call gb_Rdb_add_components,services,\
))
endif
+ifneq ($(ENABLE_WASM_STRIP_GUESSLANG),TRUE)
+$(eval $(call gb_Rdb_add_components,services,\
+ lingucomponent/source/languageguessing/guesslang \
+))
+endif
+
$(eval $(call gb_Rdb_add_components,services,\
animations/source/animcore/animcore \
cui/util/cui \
@@ -118,7 +124,6 @@ $(eval $(call gb_Rdb_add_components,services,\
$(if $(filter MACOSX,$(OS)),fpicker/source/aqua/fps_aqua) \
hwpfilter/source/hwp \
lingucomponent/source/hyphenator/hyphen/hyphen \
- lingucomponent/source/languageguessing/guesslang \
lingucomponent/source/spellcheck/spell/spell \
lingucomponent/source/thesaurus/libnth/lnth \
lingucomponent/source/numbertext/numbertext \
diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index a9bdfab0781e..d31d7283479d 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -283,7 +283,7 @@ core_constructor_list = [
# lingucomponent/source/thesaurus/libnth/lnth.component
"lingucomponent_Thesaurus_get_implementation",
"lingucomponent_SpellChecker_get_implementation",
-"lingucomponent_LangGuess_get_implementation",
+("lingucomponent_LangGuess_get_implementation", "#ifndef
ENABLE_WASM_STRIP_GUESSLANG"),
"lingucomponent_Hyphenator_get_implementation",
# package/source/xstor/xstor.component
"package_OStorageFactory_get_implementation",
@@ -844,7 +844,7 @@ des
[Libreoffice-commits] core.git: sw/source
sw/source/ui/envelp/labprt.cxx | 44 -
sw/source/ui/envelp/labprt.hxx |3 +-
2 files changed, 24 insertions(+), 23 deletions(-)
New commits:
commit 157fb80b9c147c2ab18cb81ee48eab0c8e54b36a
Author: Caolán McNamara
AuthorDate: Thu May 20 11:12:38 2021 +0100
Commit: Caolán McNamara
CommitDate: Thu May 20 16:44:07 2021 +0200
split handlers into button click and radiobutton toggle
Change-Id: I375d75518b09a14dd3a5033f2be394fb3e891838
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115866
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/sw/source/ui/envelp/labprt.cxx b/sw/source/ui/envelp/labprt.cxx
index edede9718984..b145fa3187b2 100644
--- a/sw/source/ui/envelp/labprt.cxx
+++ b/sw/source/ui/envelp/labprt.cxx
@@ -41,10 +41,10 @@ SwLabPrtPage::SwLabPrtPage(weld::Container* pPage,
weld::DialogController* pCont
SetExchangeSupport();
// Install handlers
-Link aLk = LINK(this, SwLabPrtPage, CountHdl);
-m_xPageButton->connect_clicked( aLk );
-m_xSingleButton->connect_clicked( aLk );
-m_xPrtSetup->connect_clicked( aLk );
+Link aLk = LINK(this, SwLabPrtPage, CountHdl);
+m_xPageButton->connect_toggled(aLk);
+m_xSingleButton->connect_toggled(aLk);
+m_xPrtSetup->connect_clicked(LINK(this, SwLabPrtPage, PrtSetupHdl));
SvtCommandOptions aCmdOpts;
if (aCmdOpts.Lookup(SvtCommandOptions::CMDOPTION_DISABLED, "Print"))
@@ -58,30 +58,30 @@ SwLabPrtPage::~SwLabPrtPage()
pPrinter.disposeAndClear();
}
-IMPL_LINK( SwLabPrtPage, CountHdl, weld::Button&, rButton, void )
+IMPL_LINK( SwLabPrtPage, PrtSetupHdl, weld::Button&, rButton, void )
{
-if (&rButton == m_xPrtSetup.get())
-{
-// Call printer setup
-if (!pPrinter)
-pPrinter = VclPtr::Create();
-
-PrinterSetupDialog aDlg(GetFrameWeld());
-aDlg.SetPrinter(pPrinter);
-aDlg.run();
-rButton.grab_focus();
-m_xPrinterInfo->set_label(pPrinter->GetName());
+// Call printer setup
+if (!pPrinter)
+pPrinter = VclPtr::Create();
+
+PrinterSetupDialog aDlg(GetFrameWeld());
+aDlg.SetPrinter(pPrinter);
+aDlg.run();
+rButton.grab_focus();
+m_xPrinterInfo->set_label(pPrinter->GetName());
+}
+
+IMPL_LINK(SwLabPrtPage, CountHdl, weld::ToggleButton&, rButton, void)
+{
+if (!rButton.get_active())
return;
-}
-const bool bEnable = &rButton == m_xSingleButton.get();
+
+const bool bEnable = m_xSingleButton->get_active();
m_xSingleGrid->set_sensitive(bEnable);
m_xSynchronCB->set_sensitive(!bEnable);
-OSL_ENSURE(!bEnable || &rButton == m_xPageButton.get(), "NewButton?" );
-if ( bEnable )
-{
+if (bEnable)
m_xColField->grab_focus();
-}
}
std::unique_ptr SwLabPrtPage::Create(weld::Container* pPage,
weld::DialogController* pController, const SfxItemSet* rSet)
diff --git a/sw/source/ui/envelp/labprt.hxx b/sw/source/ui/envelp/labprt.hxx
index 4f1673a7215c..79b1e95f023f 100644
--- a/sw/source/ui/envelp/labprt.hxx
+++ b/sw/source/ui/envelp/labprt.hxx
@@ -40,7 +40,8 @@ class SwLabPrtPage : public SfxTabPage
std::unique_ptr m_xPrinterInfo;
std::unique_ptr m_xPrtSetup;
-DECL_LINK(CountHdl, weld::Button&, void);
+DECL_LINK(CountHdl, weld::ToggleButton&, void);
+DECL_LINK(PrtSetupHdl, weld::Button&, void);
SwLabDlg* GetParentSwLabDlg() { return
static_cast(GetDialogController()); }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
ESC meeting minutes: 2021-05-20
* Present: + Eike, Stephan, Ilmari, Caolan, Gabriel, Heiko, Michael W, Michael S, Cloph, Guilhem, Olivier, Xisco * Completed Action Items: + None * Pending Action Items: + ESC bug stats, chart ranges don’t show data past 2019-08-13 (Xisco) * Release Engineering update (Cloph) + 7.2 alpha 1 is lacking the Windows builds, and perhaps there will be an alpha2 + Windows tinderbox is happy, but not the local setup + feature freeze in early June + 7.1 status: 7.1.4 rc1 was tagged, builds are running + Remotes: Android, iOS + Android viewer * Documentation (Olivier) + New Help (no news) + Helpcontent2 + housekeeping (Johnny_M, A. Gelmini) + New pages for ScriptForge (R. Lima, LibreOfficiant) + 3 new bugs reported + 0 closed + Guides + Calc Guide 7.1 ready to launch * UX Update (Heiko) + Bugzilla (topicUI) statistics 247(247) (topicUI) bugs open, 211(211) (needsUXEval) needs to be evaluated by the UXteam + Updates: BZ changes 1 week1 month3 months 12 months added 1(-6) 12(-1128(-11) 95(-13) commented 23(-60) 268(-90) 848(-61) 3728(-124) removed 3(2) 5(3) 11(1) 30(3) resolved 10(-6) 52(-4)125(-4) 499(-5) + top 10 contributors: Heiko Tietze made 242 changes in 1 month, and 2345 changes in 1 year Dieter made 64 changes in 1 month, and 426 changes in 1 year Foote, V Stuart made 46 changes in 1 month, and 629 changes in 1 year Xisco Fauli made 37 changes in 1 month, and 226 changes in 1 year Ilmari Lauhakangas made 30 changes in 1 month, and 368 changes in 1 year Eyal Rozenberg made 28 changes in 1 month, and 76 changes in 1 year Timur made 22 changes in 1 month, and 159 changes in 1 year Thomas Lendo made 14 changes in 1 month, and 82 changes in 1 year Roman Kuznetsov made 12 changes in 1 month, and 186 changes in 1 year BogdanB made 9 changes in 1 month, and 150 changes in 1 year + New tickets with needsUXEval May/13-20 * [Bug 142285] "Scroll Here" on scrollbar can't be performed (neither with shift+click nor right+click on it) + https://bugs.documentfoundation.org/show_bug.cgi?id=142285 + WF/NAB * [Bug 142281] full global office central document with all office module documents as parts + https://bugs.documentfoundation.org/show_bug.cgi?id=142281 + recommendation to use file system; going to resolve WF * [Bug 142258] UI: Cross-reference field names in navigator have a rather impossible naming to work with + https://bugs.documentfoundation.org/show_bug.cgi?id=142258 + DUPLICATE of bug 137741 * Ongoing controversial discussion on new cursor (bug 104169) and filter by color (bug 76258), both in Calc * Crash Testing (Caolan) + 17(-1) import failure, 8(-1) export failures + 1 coverity issues + 1 calc issue + 19 ossfuzz issues + build failed, fix merged, maybe next time + CVE-2021-25632 fileloc extension added to macOS executable denylist * Crash Reporting (Xisco) + https://crashreport.libreoffice.org/stats/version/7.0.5.2 + (+107) 2341 2234 2258 2072 1926 1878 1425 1392 1100 358 0 + https://crashreport.libreoffice.org/stats/version/7.0.6.2 + (+234) 234 0 + https://crashreport.libreoffice.org/stats/version/7.1.2.2 + (-1057) 6083 7140 8516 7429 5495 3968 2046 0 + https://crashreport.libreoffice.org/stats/version/7.1.3.2 + (+1949) 3679 1730 0 + Crashes without steps to reproduce + https://crashreport.libreoffice.org/stats/signature/ScColumn::SetPattern(long,ScPatternAttr%20const%20&) + https://crashreport.libreoffice.org/stats/signature/sd::sidebar::SlideBackground::Update() + symbol extraction is not working reliably (Cloph) + plan to re-create the symbols from the symbols server + in the past: VS build of breakpad processed a report in 2 mins, our binary did that in 20 mins + now using the same breakpad binary * Mentoring/easyhack update committer... 1 week 1 month 3 months12 months open 62(9) 120(14) 130(15) 138(15) reviews 276(-18) 1170(-24) 2706(166)2732(166) merged 269(-32) 1298(0) 3132(262)3132(262) abandoned 12(0) 86(-9) 192(12) 192(12) own commits 213(-30)959(0) 3045(-49) 13494(-68) review commits 57(2) 247(-12)970(-64)4655(-17) contributor... 1 week 1 month3 months12 months open 37(17) 62(2) 74(8) 76(8) reviews 776(-34) 3114(20) 7194(608) 7212(608)
Minutes from the UX/design meeting 2021-May-20
Present: Steve, Heiko Comments: Regina, Miklos Tickets/Topic * Improve indications for excluded data in a pivot table + https://bugs.documentfoundation.org/show_bug.cgi?id=125857 + no indication for standard filters (neither in pivot tables nor the normal view) + duplicates bug 140095 and bug 119958 (NAB) => compare with other applications * Preserve last used Paste special options selection for next session (after restarting LibreOffice) + https://bugs.documentfoundation.org/show_bug.cgi?id=69750 + some "see also" additions + could be another button "User settings" in the new dialog done for bug 134802 => just remember the last settings; easyhack * Confusing behavior when cell with number is changed to format Text: no indication if cell value type is number or text + https://bugs.documentfoundation.org/show_bug.cgi?id=98590 + different behavior when cell format is set to text depending on value exists before (number is kept) or entered later (number is taken as text and not added to summation, for example) + Value highlighting works well (Regina) + exactly the same behavior with MSO => recommend WF * Add "Goto sheet" dialog to Calc + https://bugs.documentfoundation.org/show_bug.cgi?id=129674 + add a new dialog or rely on Navigator and F&R dialog (that could be enhanced with another option) + MSO has this dialog including a range selection => comment * TSCP Classification toolbar in Calc – is it needed? + https://bugs.documentfoundation.org/show_bug.cgi?id=136401 + both Writer and Calc use a toolbar for the function but Calc has only one option while Writer allows, for example, to set classification per paragraph + same behavior on MSO (Miklos) + toolbar makes no sense for one-time operations, better use a dialog for the option => comment and accept OpenPGP_signature Description: OpenPGP digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: cui/source
cui/source/inc/page.hxx |2 +-
cui/source/tabpages/page.cxx | 19 ---
2 files changed, 9 insertions(+), 12 deletions(-)
New commits:
commit 92ed4d92fa2ff02a4c1f168aa17cf871a49c3633
Author: Caolán McNamara
AuthorDate: Thu May 20 10:36:37 2021 +0100
Commit: Caolán McNamara
CommitDate: Thu May 20 15:33:00 2021 +0200
use toggle instead of click for RadioButton
Change-Id: I4f91a6f0fb1628a8907848d9d8dffd92d382ecaf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115865
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/cui/source/inc/page.hxx b/cui/source/inc/page.hxx
index e3c5aa4ed268..fe43158e9424 100644
--- a/cui/source/inc/page.hxx
+++ b/cui/source/inc/page.hxx
@@ -136,7 +136,7 @@ private:
DECL_LINK(LayoutHdl_Impl, weld::ComboBox&, void);
DECL_LINK(GutterPositionHdl_Impl, weld::ComboBox&, void);
DECL_LINK(PaperBinHdl_Impl, weld::Widget&, void);
-DECL_LINK(SwapOrientation_Impl, weld::Button&, void);
+DECL_LINK(SwapOrientation_Impl, weld::ToggleButton&, void);
void SwapFirstValues_Impl( bool bSet );
DECL_LINK(BorderModify_Impl, weld::MetricSpinButton&, void);
void InitHeadFoot_Impl( const SfxItemSet& rSet );
diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index 729aef82bbfd..8562257a70db 100644
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -316,8 +316,8 @@ void SvxPageDescPage::Init_Impl()
m_xPaperSizeBox->connect_changed(LINK(this, SvxPageDescPage,
PaperSizeSelect_Impl));
m_xPaperWidthEdit->connect_value_changed( LINK(this, SvxPageDescPage,
PaperSizeModify_Impl));
m_xPaperHeightEdit->connect_value_changed(LINK(this, SvxPageDescPage,
PaperSizeModify_Impl));
-m_xLandscapeBtn->connect_clicked(LINK(this, SvxPageDescPage,
SwapOrientation_Impl));
-m_xPortraitBtn->connect_clicked(LINK(this, SvxPageDescPage,
SwapOrientation_Impl));
+m_xLandscapeBtn->connect_toggled(LINK(this, SvxPageDescPage,
SwapOrientation_Impl));
+m_xPortraitBtn->connect_toggled(LINK(this, SvxPageDescPage,
SwapOrientation_Impl));
Link aLink = LINK(this, SvxPageDescPage,
BorderModify_Impl);
m_xLeftMarginEdit->connect_value_changed(aLink);
@@ -465,14 +465,14 @@ void SvxPageDescPage::Reset( const SfxItemSet* rSet )
// tdf#130548 disable callbacks on the other of a pair of the radiogroup
// when toggling its partner
-m_xLandscapeBtn->connect_clicked(Link());
-m_xPortraitBtn->connect_clicked(Link());
+m_xLandscapeBtn->connect_toggled(Link());
+m_xPortraitBtn->connect_toggled(Link());
m_xLandscapeBtn->set_active(bLandscape);
m_xPortraitBtn->set_active(!bLandscape);
-m_xLandscapeBtn->connect_clicked(LINK(this, SvxPageDescPage,
SwapOrientation_Impl));
-m_xPortraitBtn->connect_clicked(LINK(this, SvxPageDescPage,
SwapOrientation_Impl));
+m_xLandscapeBtn->connect_toggled(LINK(this, SvxPageDescPage,
SwapOrientation_Impl));
+m_xPortraitBtn->connect_toggled(LINK(this, SvxPageDescPage,
SwapOrientation_Impl));
m_aBspWin.SetSize( Size( ConvertLong_Impl( aPaperSize.Width(), eUnit ),
ConvertLong_Impl( aPaperSize.Height(), eUnit ) ) );
@@ -1010,12 +1010,9 @@ IMPL_LINK_NOARG(SvxPageDescPage, PaperSizeModify_Impl,
weld::MetricSpinButton&,
RangeHdl_Impl();
}
-IMPL_LINK(SvxPageDescPage, SwapOrientation_Impl, weld::Button&, rBtn, void)
+IMPL_LINK(SvxPageDescPage, SwapOrientation_Impl, weld::ToggleButton&, rBtn,
void)
{
-if (
-!((!bLandscape && &rBtn == m_xLandscapeBtn.get()) ||
-(bLandscape && &rBtn == m_xPortraitBtn.get()))
- )
+if (!rBtn.get_active())
return;
bLandscape = m_xLandscapeBtn->get_active();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/source sd/source sw/source
cui/source/inc/cuitabarea.hxx|2 +-
cui/source/inc/cuitabline.hxx|4 ++--
cui/source/tabpages/tpbitmap.cxx |4 ++--
cui/source/tabpages/tpline.cxx |8
sd/source/ui/dlg/custsdlg.cxx|7 ++-
sd/source/ui/dlg/headerfooterdlg.cxx | 16
sd/source/ui/dlg/paragr.cxx |8
sd/source/ui/inc/custsdlg.hxx|1 +
sd/source/ui/sidebar/SlideBackground.cxx |8
sd/source/ui/sidebar/SlideBackground.hxx |4 ++--
sw/source/ui/config/optpage.cxx | 10 +-
sw/source/ui/envelp/envlop1.cxx |4 ++--
sw/source/uibase/inc/envlop.hxx |2 +-
sw/source/uibase/inc/optpage.hxx |2 +-
14 files changed, 43 insertions(+), 37 deletions(-)
New commits:
commit e292aa04980d0eac776619c9d37812ebff0a333c
Author: Caolán McNamara
AuthorDate: Thu May 20 10:29:41 2021 +0100
Commit: Caolán McNamara
CommitDate: Thu May 20 15:32:38 2021 +0200
use toggle instead of click for CheckButton
Change-Id: I6a80946481ee6fc40b2ee207a64287d1a5f96110
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115864
Tested-by: Caolán McNamara
Reviewed-by: Caolán McNamara
diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx
index aa660c6d791d..5498e19c8689 100644
--- a/cui/source/inc/cuitabarea.hxx
+++ b/cui/source/inc/cuitabarea.hxx
@@ -527,7 +527,7 @@ private:
std::unique_ptr m_xBitmapLBWin;
DECL_LINK( ModifyBitmapHdl, ValueSet*, void );
-DECL_LINK( ClickScaleHdl, weld::Button&, void );
+DECL_LINK( ClickScaleHdl, weld::ToggleButton&, void );
DECL_LINK( ModifyBitmapStyleHdl, weld::ComboBox&, void );
DECL_LINK( ModifyBitmapSizeHdl, weld::MetricSpinButton&, void );
DECL_LINK( ModifyBitmapPositionHdl, weld::ComboBox&, void );
diff --git a/cui/source/inc/cuitabline.hxx b/cui/source/inc/cuitabline.hxx
index 2839927c1bc8..6e193acedc4a 100644
--- a/cui/source/inc/cuitabline.hxx
+++ b/cui/source/inc/cuitabline.hxx
@@ -176,12 +176,12 @@ private:
DECL_LINK(ClickInvisibleHdl_Impl, weld::ComboBox&, void);
void ClickInvisibleHdl_Impl();
-DECL_LINK(ChangeStartClickHdl_Impl, weld::Button&, void);
+DECL_LINK(ChangeStartClickHdl_Impl, weld::ToggleButton&, void);
DECL_LINK(ChangeStartListBoxHdl_Impl, weld::ComboBox&, void);
DECL_LINK(ChangeStartModifyHdl_Impl, weld::MetricSpinButton&, void);
DECL_LINK(ChangeEndListBoxHdl_Impl, weld::ComboBox&, void);
DECL_LINK(ChangeEndModifyHdl_Impl, weld::MetricSpinButton&, void);
-DECL_LINK(ChangeEndClickHdl_Impl, weld::Button&, void);
+DECL_LINK(ChangeEndClickHdl_Impl, weld::ToggleButton&, void);
DECL_LINK(ChangePreviewListBoxHdl_Impl, ColorListBox&, void);
DECL_LINK(ChangePreviewModifyHdl_Impl, weld::MetricSpinButton&, void);
void ChangePreviewHdl_Impl(const weld::MetricSpinButton*);
diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx
index f0a239775d13..73dc80cb975d 100644
--- a/cui/source/tabpages/tpbitmap.cxx
+++ b/cui/source/tabpages/tpbitmap.cxx
@@ -106,7 +106,7 @@ SvxBitmapTabPage::SvxBitmapTabPage(weld::Container* pPage,
weld::DialogControlle
Link aLink1( LINK(this, SvxBitmapTabPage,
ModifyBitmapSizeHdl) );
m_xBitmapWidth->connect_value_changed( aLink1 );
m_xBitmapHeight->connect_value_changed( aLink1 );
-m_xTsbScale->connect_clicked(LINK(this, SvxBitmapTabPage, ClickScaleHdl));
+m_xTsbScale->connect_toggled(LINK(this, SvxBitmapTabPage, ClickScaleHdl));
m_xPositionLB->connect_changed( LINK( this, SvxBitmapTabPage,
ModifyBitmapPositionHdl ) );
Link aLink( LINK( this, SvxBitmapTabPage,
ModifyPositionOffsetHdl ) );
m_xPositionOffX->connect_value_changed(aLink);
@@ -596,7 +596,7 @@ IMPL_LINK_NOARG( SvxBitmapTabPage, ModifyBitmapSizeHdl,
weld::MetricSpinButton&,
m_aCtlBitmapPreview.Invalidate();
}
-IMPL_LINK_NOARG( SvxBitmapTabPage, ClickScaleHdl, weld::Button&, void )
+IMPL_LINK_NOARG( SvxBitmapTabPage, ClickScaleHdl, weld::ToggleButton&, void )
{
if (m_xTsbScale->get_state() == TRISTATE_TRUE)
{
diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx
index 1edf9a56d0bf..9b0e90886ca5 100644
--- a/cui/source/tabpages/tpline.cxx
+++ b/cui/source/tabpages/tpline.cxx
@@ -174,8 +174,8 @@ SvxLineTabPage::SvxLineTabPage(weld::Container* pPage,
weld::DialogController* p
m_xLbEndStyle->connect_changed(LINK(this, SvxLineTabPage,
ChangeEndListBoxHdl_Impl));
m_xMtrStartWidth->connect_value_changed(LINK(this, SvxLineTabPage,
ChangeStartModifyHdl_Impl));
m_xMtrEndWidth->connect_value_changed(LINK( this, SvxLineTabPage,
ChangeEndModifyHdl_Impl));
-m_xTsbCenterStart->connect_clicked(LINK(this, SvxLineTabPage,
ChangeStartClickHdl_Impl));
-m_xTsbCenterEnd->connect_clicked(LINK(this, SvxLineTabPage,
ChangeEndClickHdl_Impl));
+m_xTsbCenterStart->connect_
[Libreoffice-commits] core.git: cui/source editeng/source include/editeng
cui/source/dialogs/hangulhanjadlg.cxx | 18 +-
cui/source/factory/dlgfact.cxx|2 +-
cui/source/factory/dlgfact.hxx|2 +-
cui/source/inc/hangulhanjadlg.hxx |2 +-
editeng/source/misc/hangulhanja.cxx |4 ++--
include/editeng/edtdlg.hxx|2 +-
6 files changed, 15 insertions(+), 15 deletions(-)
New commits:
commit f180554caf7d6088d3fc0da805f5c195f8972e6b
Author: Caolán McNamara
AuthorDate: Thu May 20 10:28:33 2021 +0100
Commit: Caolán McNamara
CommitDate: Thu May 20 15:31:55 2021 +0200
use toggle instead of click for RadioButton
Change-Id: I2a01d78e2e98b35d2cd24dd7d7d2efda41e35ca8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115863
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/cui/source/dialogs/hangulhanjadlg.cxx
b/cui/source/dialogs/hangulhanjadlg.cxx
index 9ec24c5cb72e..713001004091 100644
--- a/cui/source/dialogs/hangulhanjadlg.cxx
+++ b/cui/source/dialogs/hangulhanjadlg.cxx
@@ -201,7 +201,7 @@ namespace svx
void set_active(bool active) { m_xControl->set_active(active); }
bool get_active() const { return m_xControl->get_active(); }
-void connect_clicked(const Link& rLink) {
m_xControl->connect_clicked(rLink); }
+void connect_toggled(const Link& rLink) {
m_xControl->connect_toggled(rLink); }
private:
Size GetOptimalSize() const;
@@ -517,15 +517,15 @@ namespace svx
m_xFind->connect_clicked(rHdl);
}
-void HangulHanjaConversionDialog::SetConversionFormatChangedHdl( const
Link& rHdl )
+void HangulHanjaConversionDialog::SetConversionFormatChangedHdl( const
Link& rHdl )
{
-m_xSimpleConversion->connect_clicked( rHdl );
-m_xHangulBracketed->connect_clicked( rHdl );
-m_xHanjaBracketed->connect_clicked( rHdl );
-m_xHanjaAbove->connect_clicked( rHdl );
-m_xHanjaBelow->connect_clicked( rHdl );
-m_xHangulAbove->connect_clicked( rHdl );
-m_xHangulBelow->connect_clicked( rHdl );
+m_xSimpleConversion->connect_toggled( rHdl );
+m_xHangulBracketed->connect_toggled( rHdl );
+m_xHanjaBracketed->connect_toggled( rHdl );
+m_xHanjaAbove->connect_toggled( rHdl );
+m_xHanjaBelow->connect_toggled( rHdl );
+m_xHangulAbove->connect_toggled( rHdl );
+m_xHangulBelow->connect_toggled( rHdl );
}
void HangulHanjaConversionDialog::SetClickByCharacterHdl( const
Link& _rHdl )
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index 6d0e9e31f77f..52ab08fb3a42 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -463,7 +463,7 @@ void
AbstractHangulHanjaConversionDialog_Impl::SetClickByCharacterHdl( const Lin
m_xDlg->SetClickByCharacterHdl(_rHdl );
}
-void
AbstractHangulHanjaConversionDialog_Impl::SetConversionFormatChangedHdl(const
Link& rHdl)
+void
AbstractHangulHanjaConversionDialog_Impl::SetConversionFormatChangedHdl(const
Link& rHdl)
{
m_xDlg->SetConversionFormatChangedHdl(rHdl);
}
diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx
index 1678d3c6349b..452bd08feba4 100644
--- a/cui/source/factory/dlgfact.hxx
+++ b/cui/source/factory/dlgfact.hxx
@@ -193,7 +193,7 @@ public:
virtual void SetChangeHdl( const Link& _rHdl )
override ;
virtual void SetChangeAllHdl( const Link& rHdl )
override ;
virtual void SetClickByCharacterHdl( const
Link& rHdl ) override ;
-virtual void SetConversionFormatChangedHdl( const
Link& _rHdl ) override ;
+virtual void SetConversionFormatChangedHdl( const
Link& _rHdl ) override ;
virtual void SetFindHdl( const Link& _rHdl )
override;
virtual bool GetUseBothDirections( ) const override;
virtual editeng::HangulHanjaConversion::ConversionDirection
diff --git a/cui/source/inc/hangulhanjadlg.hxx
b/cui/source/inc/hangulhanjadlg.hxx
index 716efa0827b8..f1344c800157 100644
--- a/cui/source/inc/hangulhanjadlg.hxx
+++ b/cui/source/inc/hangulhanjadlg.hxx
@@ -129,7 +129,7 @@ namespace svx
voidSetChangeAllHdl( const Link& _rHdl );
voidSetClickByCharacterHdl( const Link&
_rHdl );
-voidSetConversionFormatChangedHdl( const Link&
_rHdl );
+voidSetConversionFormatChangedHdl( const
Link& _rHdl );
voidSetFindHdl( const Link& _rHdl );
OUString GetCurrentString( ) const;
diff --git a/editeng/source/misc/hangulhanja.cxx
b/editeng/source/misc/hangulhanja.cxx
index 1b4911d4ccd4..839943e86e72 100644
--- a/editeng/source/misc/hangulhanja.cxx
+++ b/editeng/source/misc/hangulhanja.cxx
@@ -154,7 +154,7 @@ namespace editeng
DECL_LINK( OnChange, weld::Button&, void );
DECL_LINK( OnChangeAll, weld::Button&, void );
DECL_LINK( OnByCharClicked, weld::ToggleButton&, void );
-DECL_LINK( OnConversionTypeChanged, weld::Button
[Libreoffice-commits] core.git: dbaccess/source
dbaccess/source/ui/inc/WCPage.hxx |3 +--
dbaccess/source/ui/misc/WCPage.cxx | 29 +++--
2 files changed, 16 insertions(+), 16 deletions(-)
New commits:
commit 3f8e50f9b2fb35db190ce0204981f3f02d1d5ae6
Author: Caolán McNamara
AuthorDate: Thu May 20 11:24:06 2021 +0100
Commit: Caolán McNamara
CommitDate: Thu May 20 15:31:36 2021 +0200
merge handlers into single toggle handler
Change-Id: Ic168e3e0d06d732642dc222f5a3dd056fdb74b6e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115862
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/dbaccess/source/ui/inc/WCPage.hxx
b/dbaccess/source/ui/inc/WCPage.hxx
index d56f983199bb..f340d0c4757e 100644
--- a/dbaccess/source/ui/inc/WCPage.hxx
+++ b/dbaccess/source/ui/inc/WCPage.hxx
@@ -40,8 +40,7 @@ namespace dbaui
std::unique_ptr m_xFT_KeyName;
std::unique_ptr m_xEdKeyName;
-DECL_LINK( AppendDataClickHdl, weld::Button&, void );
-DECL_LINK( RadioChangeHdl, weld::Button&, void );
+DECL_LINK( RadioChangeHdl, weld::ToggleButton&, void );
DECL_LINK( KeyClickHdl, weld::ToggleButton&, void );
bool checkAppendData();
diff --git a/dbaccess/source/ui/misc/WCPage.cxx
b/dbaccess/source/ui/misc/WCPage.cxx
index 3362f17250fe..64abfd101dfd 100644
--- a/dbaccess/source/ui/misc/WCPage.cxx
+++ b/dbaccess/source/ui/misc/WCPage.cxx
@@ -66,13 +66,12 @@ OCopyTable::OCopyTable(weld::Container* pPage,
OCopyTableWizard* pWizard)
m_xCB_PrimaryColumn->set_sensitive(m_bPKeyAllowed);
-m_xRB_AppendData->connect_clicked( LINK( this, OCopyTable,
AppendDataClickHdl ) );
+m_xRB_AppendData->connect_toggled( LINK( this, OCopyTable,
RadioChangeHdl ) );
+m_xRB_DefData->connect_toggled( LINK( this, OCopyTable,
RadioChangeHdl ) );
+m_xRB_Def->connect_toggled( LINK( this, OCopyTable,
RadioChangeHdl ) );
+m_xRB_View->connect_toggled(LINK( this, OCopyTable,
RadioChangeHdl ) );
-m_xRB_DefData->connect_clicked( LINK( this, OCopyTable,
RadioChangeHdl ) );
-m_xRB_Def->connect_clicked( LINK( this, OCopyTable,
RadioChangeHdl ) );
-m_xRB_View->connect_clicked( LINK( this, OCopyTable,
RadioChangeHdl ) );
-
-m_xCB_PrimaryColumn->connect_toggled(LINK( this, OCopyTable,
KeyClickHdl ) );
+m_xCB_PrimaryColumn->connect_toggled(LINK( this, OCopyTable,
KeyClickHdl ) );
m_xFT_KeyName->set_sensitive(false);
m_xEdKeyName->set_sensitive(false);
@@ -89,11 +88,6 @@ OCopyTable::~OCopyTable()
{
}
-IMPL_LINK_NOARG( OCopyTable, AppendDataClickHdl, weld::Button&, void )
-{
-SetAppendDataRadio();
-}
-
void OCopyTable::SetAppendDataRadio()
{
m_pParent->EnableNextButton(true);
@@ -103,10 +97,17 @@ void OCopyTable::SetAppendDataRadio()
m_pParent->setOperation(CopyTableOperation::AppendData);
}
-IMPL_LINK(OCopyTable, RadioChangeHdl, weld::Button&, rButton, void)
+IMPL_LINK(OCopyTable, RadioChangeHdl, weld::ToggleButton&, rButton, void)
{
-m_pParent->EnableNextButton(&rButton != m_xRB_View.get());
-bool bKey = m_bPKeyAllowed && &rButton != m_xRB_View.get();
+if (!rButton.get_active())
+return;
+if (m_xRB_AppendData->get_active())
+{
+SetAppendDataRadio();
+return;
+}
+m_pParent->EnableNextButton(m_xRB_View->get_active());
+bool bKey = m_bPKeyAllowed && m_xRB_View->get_active();
m_xFT_KeyName->set_sensitive(bKey && m_xCB_PrimaryColumn->get_active());
m_xEdKeyName->set_sensitive(bKey && m_xCB_PrimaryColumn->get_active());
m_xCB_PrimaryColumn->set_sensitive(bKey);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: tools/source
tools/source/generic/gen.cxx |6 ++
1 file changed, 2 insertions(+), 4 deletions(-)
New commits:
commit 256c834c30c400034ce35744b74dfea7cf70069c
Author: Mike Kaganski
AuthorDate: Thu May 20 14:13:17 2021 +0200
Commit: Mike Kaganski
CommitDate: Thu May 20 15:09:32 2021 +0200
Simplify a bit: use one minmax in place of 3 min + 3 max calls
Change-Id: Ief2d8d049d2e05ee762e6855514f75be2f053836
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115835
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
diff --git a/tools/source/generic/gen.cxx b/tools/source/generic/gen.cxx
index 78025c459d07..34c9fbdfd649 100644
--- a/tools/source/generic/gen.cxx
+++ b/tools/source/generic/gen.cxx
@@ -103,10 +103,8 @@ tools::Rectangle& tools::Rectangle::Union( const
tools::Rectangle& rRect )
*this = rRect;
else
{
-nLeft = std::min( std::min( nLeft, rRect.nLeft ), std::min( nRight,
rRect.nRight ) );
-nRight = std::max( std::max( nLeft, rRect.nLeft ), std::max( nRight,
rRect.nRight ) );
-nTop= std::min( std::min( nTop, rRect.nTop ), std::min( nBottom,
rRect.nBottom ) );
-nBottom = std::max( std::max( nTop, rRect.nTop ), std::max( nBottom,
rRect.nBottom ) );
+std::tie(nLeft, nRight) = std::minmax({ nLeft, rRect.nLeft, nRight,
rRect.nRight });
+std::tie(nTop, nBottom) = std::minmax({ nTop, rRect.nTop, nBottom,
rRect.nBottom });
}
return *this;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: bin/find-headers-to-move-inside-modules.py include/IwyuFilter_include.yaml include/sfx2 include/svtools include/svx include/vcl sfx2/inc sfx2/source solenv/clang-format
bin/find-headers-to-move-inside-modules.py | 44
include/IwyuFilter_include.yaml |4 -
sfx2/inc/charmappopup.hxx |5 -
sfx2/inc/emojipopup.hxx |5 -
sfx2/source/control/charmapcontrol.cxx |2
sfx2/source/control/emojicontrol.cxx|2
sfx2/source/control/emojipopup.cxx |2
sfx2/source/dialog/charmappopup.cxx |2
solenv/clang-format/excludelist |2
svtools/IwyuFilter_svtools.yaml |4 +
svtools/source/control/toolbarmenu.cxx |2
svtools/source/uno/framestatuslistener.cxx |2
svx/inc/ParaLineSpacingPopup.hxx|5 -
svx/inc/TextCharacterSpacingPopup.hxx |5 -
svx/inc/TextUnderlinePopup.hxx |5 -
svx/inc/dstribut_enum.hxx |5 -
svx/inc/layctrl.hxx |5 -
svx/inc/lboxctrl.hxx|5 -
svx/inc/verttexttbxctrl.hxx |5 -
svx/source/gallery2/gallerybinaryengine.cxx |2
svx/source/gallery2/galleryobjectbinarystorage.cxx |2
svx/source/gallery2/galleryobjectxmlstorage.cxx |2
svx/source/gallery2/galtheme.cxx|2
svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx |2
svx/source/sidebar/paragraph/ParaLineSpacingPopup.cxx |2
svx/source/sidebar/text/TextCharacterSpacingControl.cxx |2
svx/source/sidebar/text/TextCharacterSpacingPopup.cxx |2
svx/source/sidebar/text/TextUnderlineControl.cxx|2
svx/source/sidebar/text/TextUnderlinePopup.cxx |2
svx/source/svdraw/svdedtv2.cxx |2
svx/source/tbxctrls/layctrl.cxx |2
svx/source/tbxctrls/lboxctrl.cxx|2
svx/source/tbxctrls/verttexttbxctrl.cxx |2
vcl/source/gdi/impgraph.cxx |2
34 files changed, 57 insertions(+), 84 deletions(-)
New commits:
commit 3c41913181f8663f9f1970b13ee038386016d22e
Author: Noel Grandin
AuthorDate: Thu May 20 12:45:01 2021 +0200
Commit: Noel Grandin
CommitDate: Thu May 20 14:59:02 2021 +0200
move some headers inside modules
Change-Id: I2baa9e9334850cf72e8ea1e96a2177a1c052e589
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115868
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/bin/find-headers-to-move-inside-modules.py
b/bin/find-headers-to-move-inside-modules.py
index af2ca619a461..9ec0f623128d 100755
--- a/bin/find-headers-to-move-inside-modules.py
+++ b/bin/find-headers-to-move-inside-modules.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python2
+#!/usr/bin/python3
# Look for headers inside include/ that can be moved into their respective
modules.
# Not 100% accurate
@@ -11,18 +11,18 @@ a = subprocess.Popen("git ls-files include/",
stdout=subprocess.PIPE, shell=True
with a.stdout as txt:
for line in txt:
header = line[8:].strip();
-if "README" in header: continue
-if header == "version.hrc": continue
+if b"README" in header: continue
+if header == b"version.hrc": continue
# ignore URE headers
-if header.startswith("IwyuFilter_include.yaml"): continue
-if header.startswith("cppu/"): continue
-if header.startswith("cppuhelper/"): continue
-if header.startswith("osl/"): continue
-if header.startswith("sal/"): continue
-if header.startswith("salhelper/"): continue
-if header.startswith("uno/"): continue
+if header.startswith(b"IwyuFilter_include.yaml"): continue
+if header.startswith(b"cppu/"): continue
+if header.startswith(b"cppuhelper/"): continue
+if header.startswith(b"osl/"): continue
+if header.startswith(b"sal/"): continue
+if header.startswith(b"salhelper/"): continue
+if header.startswith(b"uno/"): continue
# these are direct copies of mozilla code
-if header.startswith("onlineupdate/mozilla/"): continue
+if header.startswith(b"onlineupdate/mozilla/"): continue
headerSet.add(header)
headerSetUnused = headerSet.copy()
@@ -30,24 +30,24 @@ headerSetOnlyInOwnModule = headerSet.copy()
a = subprocess.Popen("git grep '^#include <'", stdout=subprocess.PIPE,
shell=True)
with a.stdout as txt:
for line in txt:
-idx1 = line.find("#include <")
-idx2 = line.find(">", idx1 + 10)
+idx1 = line.find(b"#include <")
+idx2 = line.find(b">", idx1 + 10)
include = line[idx1 + 10 : idx2]
headerSetUnused.discard(include)
#
-idx1 = line.find("/")
+idx1
[Libreoffice-commits] core.git: cui/source
cui/source/dialogs/hlinettp.cxx | 10 ++
cui/source/inc/hlinettp.hxx |2 +-
2 files changed, 7 insertions(+), 5 deletions(-)
New commits:
commit 17085c3072deaf6a44246d6d4be1d7022e0f09cd
Author: Caolán McNamara
AuthorDate: Thu May 20 10:21:44 2021 +0100
Commit: Caolán McNamara
CommitDate: Thu May 20 14:23:04 2021 +0200
use toggle instead of click for RadioButton
Change-Id: Ib256324f9d14cc2473e62ec4ffe0a18431e2c9cd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115861
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/cui/source/dialogs/hlinettp.cxx b/cui/source/dialogs/hlinettp.cxx
index 5ee2aa70f90f..21762ec0c5e1 100644
--- a/cui/source/dialogs/hlinettp.cxx
+++ b/cui/source/dialogs/hlinettp.cxx
@@ -67,9 +67,9 @@
SvxHyperlinkInternetTp::SvxHyperlinkInternetTp(weld::Container* pParent,
m_xRbtLinktypInternet->set_active(true);
// set handlers
-Link aLink( LINK ( this, SvxHyperlinkInternetTp,
Click_SmartProtocol_Impl ) );
-m_xRbtLinktypInternet->connect_clicked( aLink );
-m_xRbtLinktypFTP->connect_clicked( aLink );
+Link aLink( LINK ( this,
SvxHyperlinkInternetTp, Click_SmartProtocol_Impl ) );
+m_xRbtLinktypInternet->connect_toggled( aLink );
+m_xRbtLinktypFTP->connect_toggled( aLink );
m_xCbAnonymous->connect_toggled( LINK ( this, SvxHyperlinkInternetTp,
ClickAnonymousHdl_Impl ) );
m_xEdLogin->connect_changed( LINK ( this, SvxHyperlinkInternetTp,
ModifiedLoginHdl_Impl ) );
m_xCbbTarget->connect_focus_out( LINK ( this, SvxHyperlinkInternetTp,
LostFocusTargetHdl_Impl ) );
@@ -314,8 +314,10 @@ INetProtocol
SvxHyperlinkInternetTp::GetSmartProtocolFromButtons() const
|* Click on Radiobutton : Internet or FTP
|*
|/
-IMPL_LINK_NOARG(SvxHyperlinkInternetTp, Click_SmartProtocol_Impl,
weld::Button&, void)
+IMPL_LINK(SvxHyperlinkInternetTp, Click_SmartProtocol_Impl,
weld::ToggleButton&, rButton, void)
{
+if (!rButton.get_active())
+return;
OUString aScheme = GetSchemeFromButtons();
SetScheme(aScheme);
}
diff --git a/cui/source/inc/hlinettp.hxx b/cui/source/inc/hlinettp.hxx
index ae09e8ac874f..f930bc971411 100644
--- a/cui/source/inc/hlinettp.hxx
+++ b/cui/source/inc/hlinettp.hxx
@@ -45,7 +45,7 @@ private:
std::unique_ptr m_xEdPassword;
std::unique_ptr m_xCbAnonymous;
-DECL_LINK( Click_SmartProtocol_Impl, weld::Button&, void ); ///<
Radiobutton clicked: Type HTTP or FTP
+DECL_LINK( Click_SmartProtocol_Impl, weld::ToggleButton&, void ); ///<
Radiobutton toggled: Type HTTP or FTP
DECL_LINK( ClickAnonymousHdl_Impl, weld::ToggleButton&, void ); ///<
Checkbox : Anonymous User
DECL_LINK( ModifiedLoginHdl_Impl, weld::Entry&, void ); ///< Contents of
editfield "Login" modified
DECL_LINK( LostFocusTargetHdl_Impl, weld::Widget&, void ); ///< Combobox
"Target" lost its focus
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Intended behavior for wrap "parallel" for custom shapes?
Hi Mike, On Thu, May 20, 2021 at 01:01:57PM +0300, Mike Kaganski wrote: > On 20.05.2021 0:01, Regina Henschel wrote: > > Take a text, insert a custom shape "Circle Pie", and set the wrap mode > > to "Parallel". Make sure, "Contour" is off. The pie is drawn into a > > free, rectangular area and the text wraps around this area. > > Drag the angle handles to make the pie a small sector. The free area > > becomes smaller, so that it remains tight to the sector. > > > > This is the behavior in LibreOffice since version 6.1, about April 2018. > > In versions before, the free area was always as large as the underlying > > circle of the sector. > > > > Is the new way an error or is it the intended behavior? > > I would suggest to reverse-bibisect the change in 6.1, and from the changing > commit it would be likely more obvious if that was intended. See > https://bibisect.libreoffice.org/. See https://bugs.documentfoundation.org/show_bug.cgi?id=142305#c2, this is already bisected. Regards, Miklos ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: cui/source
cui/source/dialogs/insdlg.cxx | 11 +++
cui/source/dialogs/linkdlg.cxx | 32 ++--
cui/source/inc/insdlg.hxx |2 +-
cui/source/inc/linkdlg.hxx |3 +--
4 files changed, 27 insertions(+), 21 deletions(-)
New commits:
commit 12bd5e0ae116c0f18c980f3b2ce515432545d0c4
Author: Caolán McNamara
AuthorDate: Thu May 20 09:40:45 2021 +0100
Commit: Caolán McNamara
CommitDate: Thu May 20 13:42:18 2021 +0200
use toggle instead of click for RadioButton
Change-Id: Ice24a1b823301834a6bf7d7956df2e804657f6e9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115855
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx
index 4f1662a45e61..266710a83e4c 100644
--- a/cui/source/dialogs/insdlg.cxx
+++ b/cui/source/dialogs/insdlg.cxx
@@ -105,8 +105,11 @@ IMPL_LINK_NOARG(SvInsertOleDlg, BrowseHdl, weld::Button&,
void)
}
}
-IMPL_LINK_NOARG(SvInsertOleDlg, RadioHdl, weld::Button&, void)
+IMPL_LINK(SvInsertOleDlg, RadioHdl, weld::ToggleButton&, rButton, void)
{
+if (!rButton.get_active())
+return;
+
if (m_xRbNewObject->get_active())
{
m_xObjectTypeFrame->show();
@@ -137,9 +140,9 @@ SvInsertOleDlg::SvInsertOleDlg(weld::Window* pParent, const
Referenceget_height_rows(6));
m_xLbObjecttype->connect_row_activated(LINK(this, SvInsertOleDlg,
DoubleClickHdl));
m_xBtnFilepath->connect_clicked(LINK( this, SvInsertOleDlg, BrowseHdl));
-Link aLink( LINK( this, SvInsertOleDlg, RadioHdl ) );
-m_xRbNewObject->connect_clicked( aLink );
-m_xRbObjectFromfile->connect_clicked( aLink );
+Link aLink( LINK( this, SvInsertOleDlg, RadioHdl
) );
+m_xRbNewObject->connect_toggled( aLink );
+m_xRbObjectFromfile->connect_toggled( aLink );
m_xRbNewObject->set_active(true);
}
diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx
index cc26e551b994..b452526e8376 100644
--- a/cui/source/dialogs/linkdlg.cxx
+++ b/cui/source/dialogs/linkdlg.cxx
@@ -113,8 +113,8 @@ SvBaseLinksDlg::SvBaseLinksDlg(weld::Window * pParent,
LinkManager* pMgr, bool b
m_xTbLinks->connect_changed( LINK( this, SvBaseLinksDlg, LinksSelectHdl )
);
m_xTbLinks->connect_row_activated( LINK( this, SvBaseLinksDlg,
LinksDoubleClickHdl ) );
-m_xRbAutomatic->connect_clicked( LINK( this, SvBaseLinksDlg,
AutomaticClickHdl ) );
-m_xRbManual->connect_clicked( LINK( this, SvBaseLinksDlg, ManualClickHdl )
);
+m_xRbAutomatic->connect_toggled( LINK( this, SvBaseLinksDlg, ToggleHdl ) );
+m_xRbManual->connect_toggled( LINK( this, SvBaseLinksDlg, ToggleHdl ) );
m_xPbUpdateNow->connect_clicked( LINK( this, SvBaseLinksDlg,
UpdateNowClickHdl ) );
m_xPbChangeSource->connect_clicked( LINK( this, SvBaseLinksDlg,
ChangeSourceClickHdl ) );
if(!bHtmlMode)
@@ -221,22 +221,26 @@ IMPL_LINK_NOARG( SvBaseLinksDlg, LinksDoubleClickHdl,
weld::TreeView&, bool )
return true;
}
-IMPL_LINK_NOARG( SvBaseLinksDlg, AutomaticClickHdl, weld::Button&, void )
+IMPL_LINK(SvBaseLinksDlg, ToggleHdl, weld::ToggleButton&, rButton, void)
{
-int nPos;
-SvBaseLink* pLink = GetSelEntry( &nPos );
-if( pLink && !isClientFileType( pLink->GetObjType() ) &&
-SfxLinkUpdateMode::ALWAYS != pLink->GetUpdateMode() )
-SetType( *pLink, nPos, SfxLinkUpdateMode::ALWAYS );
-}
+if (!rButton.get_active())
+return;
-IMPL_LINK_NOARG( SvBaseLinksDlg, ManualClickHdl, weld::Button&, void )
-{
int nPos;
SvBaseLink* pLink = GetSelEntry( &nPos );
-if( pLink && !isClientFileType( pLink->GetObjType() ) &&
-SfxLinkUpdateMode::ONCALL != pLink->GetUpdateMode())
-SetType( *pLink, nPos, SfxLinkUpdateMode::ONCALL );
+
+if (m_xRbAutomatic->get_active())
+{
+if( pLink && !isClientFileType( pLink->GetObjType() ) &&
+SfxLinkUpdateMode::ALWAYS != pLink->GetUpdateMode() )
+SetType( *pLink, nPos, SfxLinkUpdateMode::ALWAYS );
+}
+else
+{
+if( pLink && !isClientFileType( pLink->GetObjType() ) &&
+SfxLinkUpdateMode::ONCALL != pLink->GetUpdateMode())
+SetType( *pLink, nPos, SfxLinkUpdateMode::ONCALL );
+}
}
IMPL_LINK_NOARG(SvBaseLinksDlg, UpdateNowClickHdl, weld::Button&, void)
diff --git a/cui/source/inc/insdlg.hxx b/cui/source/inc/insdlg.hxx
index 4134128fcdd8..87d6395dfb91 100644
--- a/cui/source/inc/insdlg.hxx
+++ b/cui/source/inc/insdlg.hxx
@@ -64,7 +64,7 @@ class SvInsertOleDlg : public InsertObjectDialog_Impl
DECL_LINK(DoubleClickHdl, weld::TreeView&, bool);
DECL_LINK(BrowseHdl, weld::Button&, void);
-DECL_LINK(RadioHdl, weld::Button&, void);
+DECL_LINK(RadioHdl, weld::ToggleButton&, void);
bool IsCreateNew() const override { return m_xRbNewObject->get_active(); }
public:
diff --git a/cui/source/inc/linkdlg.hxx b/cui/source/inc/linkdlg.hxx
index 3549ef0eb291..8a6453cbc7
[Libreoffice-commits] core.git: sd/source
sd/source/ui/animations/CustomAnimationDialog.cxx | 22 +++---
1 file changed, 3 insertions(+), 19 deletions(-)
New commits:
commit a8f9b351fe331785823d2bc7ffd3ebec7a0cb1fa
Author: Caolán McNamara
AuthorDate: Thu May 20 10:53:17 2021 +0100
Commit: Caolán McNamara
CommitDate: Thu May 20 13:41:59 2021 +0200
only the listbox handler does anything, remove the others
Change-Id: I7c63b21c0902edd4586e6f249d50e6f0d475a851
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115860
Tested-by: Caolán McNamara
Reviewed-by: Caolán McNamara
diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx
b/sd/source/ui/animations/CustomAnimationDialog.cxx
index 1fb22575975e..b888d92926f4 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.cxx
@@ -1428,9 +1428,7 @@ public:
void update( STLPropertySet* pSet );
DECL_LINK(implControlHdl, weld::ComboBox&, void);
-DECL_LINK(implClickHdl, weld::Button&, void);
DECL_LINK(DurationModifiedHdl, weld::MetricSpinButton&, void);
-void implHdl(const weld::Widget*);
private:
const STLPropertySet* mpSet;
@@ -1472,7 +1470,6 @@
CustomAnimationDurationTabPage::CustomAnimationDurationTabPage(weld::Container*
fillRepeatComboBox(*mxCBRepeat);
-mxRBClickSequence->connect_clicked(LINK(this,
CustomAnimationDurationTabPage, implClickHdl));
mxLBTrigger->connect_changed(LINK(this, CustomAnimationDurationTabPage,
implControlHdl));
mxCBXDuration->connect_value_changed(LINK( this,
CustomAnimationDurationTabPage, DurationModifiedHdl));
@@ -1609,14 +1606,10 @@
CustomAnimationDurationTabPage::CustomAnimationDurationTabPage(weld::Container*
}
}
-IMPL_LINK(CustomAnimationDurationTabPage, implClickHdl, weld::Button&, rBtn,
void)
-{
-implHdl(&rBtn);
-}
-
-IMPL_LINK(CustomAnimationDurationTabPage, implControlHdl, weld::ComboBox&,
rListBox, void)
+IMPL_LINK_NOARG(CustomAnimationDurationTabPage, implControlHdl,
weld::ComboBox&, void)
{
-implHdl(&rListBox);
+mxRBInteractive->set_active(true);
+assert(!mxRBClickSequence->get_active());
}
IMPL_LINK_NOARG(CustomAnimationDurationTabPage, DurationModifiedHdl,
weld::MetricSpinButton&, void)
@@ -1631,15 +1624,6 @@ IMPL_LINK_NOARG(CustomAnimationDurationTabPage,
DurationModifiedHdl, weld::Metri
}
}
-void CustomAnimationDurationTabPage::implHdl(const weld::Widget* pControl)
-{
-if (pControl == mxLBTrigger.get())
-{
-mxRBClickSequence->set_active(false);
-mxRBInteractive->set_active(true);
-}
-}
-
void CustomAnimationDurationTabPage::update( STLPropertySet* pSet )
{
auto nPos = mxLBStart->get_active();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/jsdialogs' - 43 commits - basctl/source chart2/source comphelper/source cui/source editeng/source include/comphelper include/editeng include/sfx2 includ
Rebased ref, commits from common ancestor:
commit 3c6bf1ba72e62b01b7e7ec9343ff216f8cd2130d
Author: Caolán McNamara
AuthorDate: Fri Mar 12 14:25:34 2021 +
Commit: Szymon Kłos
CommitDate: Thu May 20 13:22:22 2021 +0200
weld the sidebar deck
Change-Id: Idc6710df7e59bcb5f61fca783e0cc0666cb13a1f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112404
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/include/sfx2/sidebar/Deck.hxx b/include/sfx2/sidebar/Deck.hxx
index 5122e915da14..489f6137b3a7 100644
--- a/include/sfx2/sidebar/Deck.hxx
+++ b/include/sfx2/sidebar/Deck.hxx
@@ -19,15 +19,14 @@
#pragma once
#include
-
-#include
-
-class ScrollBar;
+#include
+#include
namespace sfx2::sidebar
{
class DeckDescriptor;
class DeckTitleBar;
+class SidebarDockingWindow;
/** This is the parent window of the panels.
It displays the deck title.
@@ -35,25 +34,25 @@ class DeckTitleBar;
A deck consists of multiple panels.
E.g. Properties, Styles, Navigator.
*/
-class Deck final : public vcl::Window
+class Deck final : public InterimItemWindow
{
public:
-Deck(const DeckDescriptor& rDeckDescriptor, vcl::Window* pParentWindow,
+Deck(const DeckDescriptor& rDeckDescriptor, SidebarDockingWindow*
pParentWindow,
const std::function& rCloserAction);
virtual ~Deck() override;
virtual void dispose() override;
const OUString& GetId() const { return msId; }
-VclPtr const& GetTitleBar() const;
+DeckTitleBar* GetTitleBar() const;
tools::Rectangle GetContentArea() const;
void ResetPanels(const SharedPanelContainer& rPanels);
const SharedPanelContainer& GetPanels() const { return maPanels; }
-Panel* GetPanel(OUString const& panelId);
+std::shared_ptr GetPanel(std::u16string_view panelId);
void RequestLayout();
-vcl::Window* GetPanelParentWindow();
+weld::Widget* GetPanelParentWindow();
/** Try to make the panel completely visible.
When the whole panel does not fit then make its top visible
@@ -61,11 +60,8 @@ public:
*/
void ShowPanel(const Panel& rPanel);
-virtual void ApplySettings(vcl::RenderContext& rRenderContext) override;
-virtual void Paint(vcl::RenderContext& rRenderContext,
- const tools::Rectangle& rUpdateArea) override;
virtual void DataChanged(const DataChangedEvent& rEvent) override;
-virtual bool EventNotify(NotifyEvent& rEvent) override;
+
virtual void Resize() override;
virtual void DumpAsPropertyTree(tools::JsonWriter&) override;
@@ -74,17 +70,7 @@ public:
sal_Int32 GetMinimalWidth() const { return mnMinimalWidth; }
-class ScrollContainerWindow final : public vcl::Window
-{
-public:
-ScrollContainerWindow(vcl::Window* pParentWindow);
-virtual void Paint(vcl::RenderContext& rRenderContext,
- const tools::Rectangle& rUpdateArea) override;
-void SetSeparators(const ::std::vector& rSeparators);
-
-private:
-std::vector maSeparators;
-};
+SidebarDockingWindow* GetDockingWindow() const { return mxParentWindow; }
private:
void RequestLayoutInternal();
@@ -94,14 +80,11 @@ private:
sal_Int32 mnMinimalWidth;
sal_Int32 mnMinimalHeight;
SharedPanelContainer maPanels;
-VclPtr mpTitleBar;
-VclPtr mpScrollClipWindow;
-VclPtr mpScrollContainer;
-VclPtr mpFiller;
-VclPtr mpVerticalScrollBar;
-
-DECL_LINK(HandleVerticalScrollBarChange, ScrollBar*, void);
-bool ProcessWheelEvent(CommandEvent const* pCommandEvent);
+
+VclPtr mxParentWindow;
+std::unique_ptr mxTitleBar;
+std::unique_ptr mxVerticalScrollBar;
+std::unique_ptr mxContents;
};
} // end of namespace sfx2::sidebar
diff --git a/include/sfx2/sidebar/FocusManager.hxx
b/include/sfx2/sidebar/FocusManager.hxx
index 0bebe247e634..2370ff3f801c 100644
--- a/include/sfx2/sidebar/FocusManager.hxx
+++ b/include/sfx2/sidebar/FocusManager.hxx
@@ -20,6 +20,7 @@
#include
#include
+#include
#include
namespace weld {
@@ -64,13 +65,14 @@ public:
void GrabFocus();
void GrabFocusPanel();
-void SetDeckTitle(DeckTitleBar* pDeckTitleBar);
+void SetDeck(Deck* pDeck);
void SetPanels(const SharedPanelContainer& rPanels);
void SetButtons(const std::vector& rButtons);
private:
-VclPtr mpDeckTitleBar;
-std::vector > maPanels;
+VclPtr mxDeck;
+DeckTitleBar* mpDeckTitleBar;
+SharedPanelContainer maPanels;
std::vector maButtons;
const std::function maShowPanelFunctor;
@@ -94,7 +96,6 @@ private:
/** Listen for key events for panels and buttons.
*/
DECL_LINK(KeyInputHdl, const KeyEvent&, bool);
-DECL_LINK(ChildEventListener, VclWindowEvent&, void);
void ClearPanels();
void ClearButtons();
@@ -105,10 +106,6 @@ private:
void RegisterWindow(weld::Widget& rWidget);
static void UnregisterWindow(weld::W
[Libreoffice-commits] core.git: 2 commits - oox/qa svx/source
oox/qa/unit/CryptoTest.cxx| 13 +
svx/source/svdraw/svdview.cxx |2 +-
2 files changed, 14 insertions(+), 1 deletion(-)
New commits:
commit 9d146b9418c66d1fd21fe0eb74f1b4daef30a31a
Author: Noel Grandin
AuthorDate: Thu May 20 11:17:04 2021 +0200
Commit: Noel Grandin
CommitDate: Thu May 20 13:11:47 2021 +0200
fix crash when del in textbox in draw
regression from
commit 9090dc1f3b27195f5defd35586ac79357992be21
split OutputDevice from Window
Change-Id: Ib0df6b691f2281c366126c3a0cf3aae985e706be
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115857
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx
index a2e6861556ad..0cfe786c8799 100644
--- a/svx/source/svdraw/svdview.cxx
+++ b/svx/source/svdraw/svdview.cxx
@@ -163,7 +163,7 @@ SdrView::~SdrView()
bool SdrView::KeyInput(const KeyEvent& rKEvt, vcl::Window* pWin)
{
-SetActualWin(pWin->GetOutDev());
+SetActualWin(pWin ? pWin->GetOutDev() : nullptr);
bool bRet = SdrCreateView::KeyInput(rKEvt,pWin);
if (!bRet && !IsExtendedKeyInputDispatcherEnabled()) {
bRet = true;
commit 2601814987fdac8d0b1d655d40987c331f3e51f4
Author: Noel Grandin
AuthorDate: Thu May 20 09:11:48 2021 +0200
Commit: Noel Grandin
CommitDate: Thu May 20 13:11:35 2021 +0200
fix leak in CppunitTest_oox_crypto
Change-Id: I41d4fe581842cb7822ae899dc6ee6a43e485d211
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115856
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/oox/qa/unit/CryptoTest.cxx b/oox/qa/unit/CryptoTest.cxx
index 94f1f765fc2b..cbdf99b65216 100644
--- a/oox/qa/unit/CryptoTest.cxx
+++ b/oox/qa/unit/CryptoTest.cxx
@@ -7,6 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
+#include
#include
#include
#include
@@ -20,11 +21,16 @@
#include
#include
+#if USE_TLS_NSS
+#include
+#endif
+
using namespace css;
class CryptoTest : public CppUnit::TestFixture
{
public:
+virtual ~CryptoTest() override;
void testCryptoHash();
void testRoundUp();
void testStandard2007();
@@ -58,6 +64,13 @@ std::string toString(std::vector const& aInput)
}
}
+CryptoTest::~CryptoTest()
+{
+#if USE_TLS_NSS
+NSS_Shutdown();
+#endif
+}
+
void CryptoTest::testCryptoHash()
{
// Check examples from Wikipedia (https://en.wikipedia.org/wiki/HMAC)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/source
cui/source/dialogs/splitcelldlg.cxx | 11 ++-
cui/source/inc/splitcelldlg.hxx |2 +-
2 files changed, 7 insertions(+), 6 deletions(-)
New commits:
commit 39001d0ad8de4aa0b8f643aeadc1ec415e1d66e2
Author: Caolán McNamara
AuthorDate: Thu May 20 09:38:42 2021 +0100
Commit: Caolán McNamara
CommitDate: Thu May 20 12:38:35 2021 +0200
use toggle instead of click for RadioButton
doesn't seem sensible to listen to the prop checkbox in this handler
Change-Id: If514b5a9072e789b6b2cbfc990714e236335d99c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115854
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/cui/source/dialogs/splitcelldlg.cxx
b/cui/source/dialogs/splitcelldlg.cxx
index f58b8cc0ece5..45511a59b794 100644
--- a/cui/source/dialogs/splitcelldlg.cxx
+++ b/cui/source/dialogs/splitcelldlg.cxx
@@ -28,9 +28,8 @@ SvxSplitTableDlg::SvxSplitTableDlg(weld::Window *pParent,
bool bIsTableVertical,
, mnMaxVertical(nMaxVertical)
, mnMaxHorizontal(nMaxHorizontal)
{
-m_xHorzBox->connect_clicked(LINK(this, SvxSplitTableDlg, ClickHdl));
-m_xPropCB->connect_clicked(LINK(this, SvxSplitTableDlg, ClickHdl));
-m_xVertBox->connect_clicked(LINK(this, SvxSplitTableDlg, ClickHdl));
+m_xHorzBox->connect_toggled(LINK(this, SvxSplitTableDlg, ToggleHdl));
+m_xVertBox->connect_toggled(LINK(this, SvxSplitTableDlg, ToggleHdl));
if (mnMaxVertical < 2)
{
@@ -51,9 +50,11 @@ SvxSplitTableDlg::SvxSplitTableDlg(weld::Window *pParent,
bool bIsTableVertical,
}
}
-IMPL_LINK(SvxSplitTableDlg, ClickHdl, weld::Button&, rButton, void)
+IMPL_LINK(SvxSplitTableDlg, ToggleHdl, weld::ToggleButton&, rButton, void)
{
-const bool bIsVert = &rButton == m_xVertBox.get();
+if (!rButton.get_active())
+return;
+const bool bIsVert = m_xVertBox->get_active();
tools::Long nMax = bIsVert ? mnMaxVertical : mnMaxHorizontal;
m_xPropCB->set_sensitive(!bIsVert);
m_xCountEdit->set_max(nMax);
diff --git a/cui/source/inc/splitcelldlg.hxx b/cui/source/inc/splitcelldlg.hxx
index 86655a2a5755..22e61e0ff7fc 100644
--- a/cui/source/inc/splitcelldlg.hxx
+++ b/cui/source/inc/splitcelldlg.hxx
@@ -35,7 +35,7 @@ private:
public:
SvxSplitTableDlg(weld::Window *pParent, bool bIsTableVertical, tools::Long
nMaxVertical, tools::Long nMaxHorizontal);
-DECL_LINK(ClickHdl, weld::Button&, void);
+DECL_LINK(ToggleHdl, weld::ToggleButton&, void);
bool IsHorizontal() const;
bool IsProportional() const;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/source
cui/source/dialogs/SpellDialog.cxx |4 ++--
cui/source/dialogs/insdlg.cxx |8
cui/source/inc/SpellDialog.hxx |2 +-
cui/source/inc/insdlg.hxx |2 +-
cui/source/inc/numfmt.hxx |4 ++--
cui/source/inc/textanim.hxx|6 +++---
cui/source/inc/textattr.hxx|4 ++--
cui/source/options/connpooloptions.cxx |6 +++---
cui/source/options/connpooloptions.hxx |2 +-
cui/source/options/fontsubs.cxx|7 ++-
cui/source/options/fontsubs.hxx|1 +
cui/source/options/optctl.cxx |4 ++--
cui/source/options/optctl.hxx |2 +-
cui/source/options/optfltr.cxx |8
cui/source/options/optfltr.hxx |4 ++--
cui/source/options/optinet2.cxx|8
cui/source/options/optinet2.hxx|4 ++--
cui/source/options/optjava.cxx |4 ++--
cui/source/options/optjava.hxx |2 +-
cui/source/options/optsave.cxx |4 ++--
cui/source/options/optsave.hxx |2 +-
cui/source/options/optupdt.cxx |4 ++--
cui/source/options/optupdt.hxx |2 +-
cui/source/tabpages/numfmt.cxx | 12 ++--
cui/source/tabpages/textanim.cxx | 12 ++--
cui/source/tabpages/textattr.cxx | 20 ++--
26 files changed, 72 insertions(+), 66 deletions(-)
New commits:
commit 5792b08d3762117dfa28ea08638d79a5b01957ad
Author: Caolán McNamara
AuthorDate: Thu May 20 09:31:05 2021 +0100
Commit: Caolán McNamara
CommitDate: Thu May 20 12:38:17 2021 +0200
use toggle instead of click for CheckButton
Change-Id: I73ffd66a6e5eed1f95882e874d9319ecad5550f5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115853
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/cui/source/dialogs/SpellDialog.cxx
b/cui/source/dialogs/SpellDialog.cxx
index 5ad37af93487..a8e20608d285 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -246,7 +246,7 @@ void SpellDialog::Init_Impl()
m_xUndoPB->connect_clicked(LINK( this, SpellDialog, UndoHdl ) );
m_xAutoCorrPB->connect_clicked( LINK( this, SpellDialog, ExtClickHdl ) );
-m_xCheckGrammarCB->connect_clicked( LINK( this, SpellDialog,
CheckGrammarHdl ));
+m_xCheckGrammarCB->connect_toggled( LINK( this, SpellDialog,
CheckGrammarHdl ));
m_xOptionsPB->connect_clicked( LINK( this, SpellDialog, ExtClickHdl ) );
m_xSuggestionLB->connect_row_activated( LINK( this, SpellDialog,
DoubleClickChangeHdl ) );
@@ -448,7 +448,7 @@ IMPL_LINK( SpellDialog, ExtClickHdl, weld::Button&, rBtn,
void )
}
}
-IMPL_LINK_NOARG(SpellDialog, CheckGrammarHdl, weld::Button&, void)
+IMPL_LINK_NOARG(SpellDialog, CheckGrammarHdl, weld::ToggleButton&, void)
{
rParent.SetGrammarChecking(m_xCheckGrammarCB->get_active());
Impl_Restore(true);
diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx
index d22837c7b4eb..4f1662a45e61 100644
--- a/cui/source/dialogs/insdlg.cxx
+++ b/cui/source/dialogs/insdlg.cxx
@@ -358,9 +358,9 @@ void SfxInsertFloatingFrameDialog::Init()
m_xNMMarginHeight = m_xBuilder->weld_spin_button("height");
m_xCBMarginHeightDefault = m_xBuilder->weld_check_button("defaultheight");
-Link aLink(LINK(this, SfxInsertFloatingFrameDialog,
CheckHdl));
-m_xCBMarginWidthDefault->connect_clicked(aLink);
-m_xCBMarginHeightDefault->connect_clicked(aLink);
+Link aLink(LINK(this,
SfxInsertFloatingFrameDialog, CheckHdl));
+m_xCBMarginWidthDefault->connect_toggled(aLink);
+m_xCBMarginHeightDefault->connect_toggled(aLink);
m_xCBMarginWidthDefault->set_active(true);
m_xCBMarginHeightDefault->set_active(true);
@@ -545,7 +545,7 @@ short SfxInsertFloatingFrameDialog::run()
return nRet;
}
-IMPL_LINK(SfxInsertFloatingFrameDialog, CheckHdl, weld::Button&, rButton, void)
+IMPL_LINK(SfxInsertFloatingFrameDialog, CheckHdl, weld::ToggleButton&,
rButton, void)
{
weld::CheckButton& rCB = dynamic_cast(rButton);
if (&rCB == m_xCBMarginWidthDefault.get())
diff --git a/cui/source/inc/SpellDialog.hxx b/cui/source/inc/SpellDialog.hxx
index f184f8e78ad2..678f09729e3e 100644
--- a/cui/source/inc/SpellDialog.hxx
+++ b/cui/source/inc/SpellDialog.hxx
@@ -172,7 +172,7 @@ private:
DECL_LINK(ChangeAllHdl, weld::Button&, void);
DECL_LINK(IgnoreAllHdl, weld::Button&, void);
DECL_LINK(IgnoreHdl, weld::Button&, void);
-DECL_LINK(CheckGrammarHdl, weld::Button&, void);
+DECL_LINK(CheckGrammarHdl, weld::ToggleButton&, void);
DECL_LINK(ExtClickHdl, weld::Button&, void);
DECL_LINK(CancelHdl, weld::Button&, void);
DECL_LINK(ModifyHdl, LinkParamNone*, void);
diff --git a/cui/source/inc/insdlg.hxx b/cui/source/inc/insdlg.hxx
index d6bd30ed395d..4134128fcdd8 100644
--- a/cui/source/inc/insdlg.hxx
+++ b/cui/source/inc/insdlg.hxx
@@ -99,7 +99,7
[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-1' - sw/source
sw/source/core/layout/layact.cxx |2 ++
sw/source/core/layout/tabfrm.cxx |2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 2becbe6073697d58be45816c963379a80c645e49
Author: Michael Stahl
AuthorDate: Wed May 8 16:23:25 2019 +0200
Commit: Michael Stahl
CommitDate: Thu May 20 11:14:21 2021 +0200
tdf#124675 sw: fix crash when moving SwTextFrame in table to prev page
The problem is that the SwTabFrame and SwRowFrame that are being
iterated are deleted:
7 SwFrame::DestroyFrame(SwFrame*) (pFrame=0x79052c0) at
sw/source/core/layout/ssfrm.cxx:386
8 SwTabFrame::RemoveFollowFlowLine() (this=0x5bf07d0) at
sw/source/core/layout/tabfrm.cxx:907
9 SwTabFrame::MakeAll(OutputDevice*) (this=0x5bf07d0) at
sw/source/core/layout/tabfrm.cxx:1839
10 SwFrame::PrepareMake(OutputDevice*) (this=0x5bf07d0) at
sw/source/core/layout/calcmove.cxx:344
11 SwFrame::Calc(OutputDevice*) const (this=0x5bf07d0) at
sw/source/core/layout/trvlfrm.cxx:1790
12 SwFrame::PrepareMake(OutputDevice*) (this=0x603a570) at
sw/source/core/layout/calcmove.cxx:247
13 SwFrame::Calc(OutputDevice*) const (this=0x603a570) at
sw/source/core/layout/trvlfrm.cxx:1790
14 SwFrame::PrepareMake(OutputDevice*) (this=0x5daf120) at
sw/source/core/layout/calcmove.cxx:247
15 SwFrame::Calc(OutputDevice*) const (this=0x5daf120) at
sw/source/core/layout/trvlfrm.cxx:1790
16 SwFrame::PrepareMake(OutputDevice*) (this=0x6005ca0) at
sw/source/core/layout/calcmove.cxx:247
17 SwFrame::Calc(OutputDevice*) const (this=0x6005ca0) at
sw/source/core/layout/trvlfrm.cxx:1790
18 SwFrame::MakePos() (this=0x6094330) at
sw/source/core/layout/calcmove.cxx:490
19 SwTextFrame::MakePos() (this=0x6094330) at
sw/source/core/text/frmform.cxx:343
20 SwContentFrame::MakeAll(OutputDevice*) (this=0x6094330) at
sw/source/core/layout/calcmove.cxx:1346
21 SwFrame::OptPrepareMake() (this=0x6094330) at
sw/source/core/layout/calcmove.cxx:368
22 SwFrame::OptCalc() const (this=0x6094330) at
sw/source/core/inc/frame.hxx:1060
23 SwLayAction::FormatLayout(OutputDevice*, SwLayoutFrame*, bool)
(this=0x7ffc6da48350, pLay=0x8a349c0, bAddRect=false) at
sw/source/core/layout/layact.cxx:1362
24 SwLayAction::FormatLayout(OutputDevice*, SwLayoutFrame*, bool)
(this=0x7ffc6da48350, pLay=0x79052c0, bAddRect=false) at
sw/source/core/layout/layact.cxx:1357
25 SwLayAction::FormatLayoutTab(SwTabFrame*, bool) (this=0x7ffc6da48350,
pTab=0x7a9c300, bAddRect=false) at sw/source/core/layout/layact.cxx:1569
26 SwLayAction::FormatLayout(OutputDevice*, SwLayoutFrame*, bool)
(this=0x7ffc6da48350, pLay=0x7c30300, bAddRect=true) at
sw/source/core/layout/layact.cxx:1354
27 SwLayAction::FormatLayout(OutputDevice*, SwLayoutFrame*, bool)
(this=0x7ffc6da48350, pLay=0x79e1780, bAddRect=true) at
sw/source/core/layout/layact.cxx:1357
28 SwLayAction::InternalAction(OutputDevice*) (this=0x7ffc6da48350) at
sw/source/core/layout/layact.cxx:546
They are deleted because the last SwTextFrame was moved via MoveBwd() to
the previous page, and is formatted there.
(regression from commit 18765b9fa739337d2d891513f6e2fb7c3ce23b50)
Prevent this via:
* delete-guard for the SwRowFrame - causing RemoveFollowFlowLine() to
return early (also, let it return false, so the Join() isn't even
called, although that doesn't make a difference in practice because
of the next item:)
* join-guard for the SwTabFrame - otherwise tabfrm.cxx:2199 will Join()
it anyway
This means that when the page with the follow-frame is done formatting,
the empty SwTabFrame with no SwTextFrame in it will remain. Fortunately
this is not a problem, because due to the moving, the previous page will
be invalid and layact.cxx:613 will iterate to the previous page and
format it again; then tabfrm:2199 of the master SwTabFrame will detect
that the follow SwTabFrame is empty and Join() it.
Change-Id: I2cca89d63b81e7d4909319fa4feab2f5d67a6ff3
Reviewed-on: https://gerrit.libreoffice.org/71996
Tested-by: Jenkins
Reviewed-by: Michael Stahl
(cherry picked from commit cc5916cd314a27b0cc99560ab887480026630a95)
Reviewed-on: https://gerrit.libreoffice.org/72031
Tested-by: Xisco Faulí
Reviewed-by: Miklos Vajna
(cherry picked from commit 232b467083dd3b55f261bebe084e696bee200ec9)
diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx
index 30f6499b01f9..ae643be49d37 100644
--- a/sw/source/core/layout/layact.cxx
+++ b/sw/source/core/layout/layact.cxx
@@ -1565,9 +1565,11 @@ bool SwLayAction::FormatLayoutTab( SwTabFrame *pTab,
bool bAddRect )
// format lowers, only if table frame is valid
if ( pTab->isFrameAreaDefinitionValid() )
{
+FlowFrameJoinLockGuard tabG(pTab); // tdf#124675 prevent Join() if
pTab becomes empty
SwLayoutFrame *pLow = stati
[Libreoffice-commits] core.git: cui/source include/svx svx/source
cui/source/dialogs/cuifmsearch.cxx| 53 --
cui/source/inc/cuifmsearch.hxx|3 +
include/svx/srchdlg.hxx |4 +-
svx/source/dialog/SafeModeDialog.cxx |7 +++
svx/source/dialog/srchdlg.cxx | 42 +++
svx/source/tbxctrls/extrusioncontrols.cxx | 19 --
svx/source/tbxctrls/fontworkgallery.cxx | 41 +++
7 files changed, 103 insertions(+), 66 deletions(-)
New commits:
commit 304b74784297df7cbd0762a2f468ba13b33402bd
Author: Caolán McNamara
AuthorDate: Wed May 19 20:55:17 2021 +0100
Commit: Caolán McNamara
CommitDate: Thu May 20 12:23:05 2021 +0200
use toggle instead of click for RadioButton
Change-Id: I8de3daf3799a78c63be2c560afa4a7cc02d63daa
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115852
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/cui/source/dialogs/cuifmsearch.cxx
b/cui/source/dialogs/cuifmsearch.cxx
index de7681fa7d79..2433d0d8445d 100644
--- a/cui/source/dialogs/cuifmsearch.cxx
+++ b/cui/source/dialogs/cuifmsearch.cxx
@@ -163,12 +163,12 @@ FmSearchDialog::~FmSearchDialog()
void FmSearchDialog::Init(const OUString& strVisibleFields, const OUString&
sInitialText)
{
//the initialization of all the Controls
-m_prbSearchForText->connect_clicked(LINK(this, FmSearchDialog,
OnClickedFieldRadios));
-m_prbSearchForNull->connect_clicked(LINK(this, FmSearchDialog,
OnClickedFieldRadios));
-m_prbSearchForNotNull->connect_clicked(LINK(this, FmSearchDialog,
OnClickedFieldRadios));
+m_prbSearchForText->connect_toggled(LINK(this, FmSearchDialog,
OnToggledSearchRadio));
+m_prbSearchForNull->connect_toggled(LINK(this, FmSearchDialog,
OnToggledSearchRadio));
+m_prbSearchForNotNull->connect_toggled(LINK(this, FmSearchDialog,
OnToggledSearchRadio));
-m_prbAllFields->connect_clicked(LINK(this, FmSearchDialog,
OnClickedFieldRadios));
-m_prbSingleField->connect_clicked(LINK(this, FmSearchDialog,
OnClickedFieldRadios));
+m_prbAllFields->connect_toggled(LINK(this, FmSearchDialog,
OnToggledFieldRadios));
+m_prbSingleField->connect_toggled(LINK(this, FmSearchDialog,
OnToggledFieldRadios));
m_pbSearchAgain->connect_clicked(LINK(this, FmSearchDialog,
OnClickedSearchAgain));
m_ppbApproxSettings->connect_clicked(LINK(this, FmSearchDialog,
OnClickedSpecialSettings));
@@ -240,24 +240,29 @@ short FmSearchDialog::run()
return nRet;
}
-IMPL_LINK(FmSearchDialog, OnClickedFieldRadios, weld::Button&, rButton, void)
+IMPL_LINK(FmSearchDialog, OnToggledSearchRadio, weld::ToggleButton&, rButton,
void)
{
-if ((&rButton == m_prbSearchForText.get()) || (&rButton ==
m_prbSearchForNull.get()) || (&rButton == m_prbSearchForNotNull.get()))
+if (!rButton.get_active())
+return;
+EnableSearchForDependees(true);
+}
+
+IMPL_LINK(FmSearchDialog, OnToggledFieldRadios, weld::ToggleButton&, rButton,
void)
+{
+if (!rButton.get_active())
+return;
+
+// en- or disable field list box accordingly
+if (m_prbSingleField->get_active())
{
-EnableSearchForDependees(true);
+m_plbField->set_sensitive(true);
+m_pSearchEngine->RebuildUsedFields(m_plbField->get_active());
}
else
-// en- or disable field list box accordingly
-if (&rButton == m_prbSingleField.get())
-{
-m_plbField->set_sensitive(true);
-m_pSearchEngine->RebuildUsedFields(m_plbField->get_active());
-}
-else
-{
-m_plbField->set_sensitive(false);
-m_pSearchEngine->RebuildUsedFields(-1);
-}
+{
+m_plbField->set_sensitive(false);
+m_pSearchEngine->RebuildUsedFields(-1);
+}
}
IMPL_LINK_NOARG(FmSearchDialog, OnClickedSearchAgain, weld::Button&, void)
@@ -638,19 +643,19 @@ void FmSearchDialog::LoadParams()
nInitialField = 0;
m_plbField->set_active(nInitialField);
OnFieldSelected(*m_plbField);
-// all fields/single field (AFTER selecting the field because
OnClickedFieldRadios expects a valid value there)
+// all fields/single field (AFTER selecting the field because
OnToggledFieldRadios expects a valid value there)
if (aParams.bAllFields)
{
m_prbSingleField->set_active(false);
m_prbAllFields->set_active(true);
-OnClickedFieldRadios(*m_prbAllFields);
-// OnClickedFieldRadios also calls to RebuildUsedFields
+OnToggledFieldRadios(*m_prbAllFields);
+// OnToggledFieldRadios also calls to RebuildUsedFields
}
else
{
m_prbAllFields->set_active(false);
m_prbSingleField->set_active(true);
-OnClickedFieldRadios(*m_prbSingleField);
+OnToggledFieldRadios(*m_prbSingleField);
}
m_plbPosition->set_active(aParams.nPosition);
@@ -708,7 +713,7 @@ void FmSearchDialog::LoadParams()
case
[Libreoffice-commits] core.git: shell/source
shell/source/cmdmail/cmdmailmsg.cxx | 35 +--
shell/source/cmdmail/cmdmailmsg.hxx |3 ++-
2 files changed, 19 insertions(+), 19 deletions(-)
New commits:
commit 7a4fffb19fb3d573d9afd3f7136cd0e5b545b706
Author: Arnaud Versini
AuthorDate: Sun Apr 18 16:28:49 2021 +0200
Commit: Michael Stahl
CommitDate: Thu May 20 12:02:32 2021 +0200
shell : use std::mutex in CmdMailMsg
Change-Id: I2aac780ce17e327a2f5ddbc835583bad1056bfc5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114244
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/shell/source/cmdmail/cmdmailmsg.cxx
b/shell/source/cmdmail/cmdmailmsg.cxx
index bd8657577b75..2a6a5f843af2 100644
--- a/shell/source/cmdmail/cmdmailmsg.cxx
+++ b/shell/source/cmdmail/cmdmailmsg.cxx
@@ -21,7 +21,6 @@
using com::sun::star::container::NoSuchElementException;
using com::sun::star::container::XNameAccess;
-using osl::MutexGuard;
using namespace cppu;
using namespace com::sun::star::uno;
@@ -29,91 +28,91 @@ using namespace com::sun::star::uno;
void SAL_CALL CmdMailMsg::setBody( const OUString& aBody )
{
-MutexGuard aGuard( m_aMutex );
+std::scoped_lock aGuard( m_aMutex );
m_aBody = aBody;
}
OUString SAL_CALL CmdMailMsg::getBody( )
{
-MutexGuard aGuard( m_aMutex );
+std::scoped_lock aGuard( m_aMutex );
return m_aBody;
}
void SAL_CALL CmdMailMsg::setRecipient( const OUString& aRecipient )
{
-MutexGuard aGuard( m_aMutex );
+std::scoped_lock aGuard( m_aMutex );
m_aRecipient = aRecipient;
}
OUString SAL_CALL CmdMailMsg::getRecipient( )
{
-MutexGuard aGuard( m_aMutex );
+std::scoped_lock aGuard( m_aMutex );
return m_aRecipient;
}
void SAL_CALL CmdMailMsg::setCcRecipient( const Sequence< OUString >&
aCcRecipient )
{
-MutexGuard aGuard( m_aMutex );
+std::scoped_lock aGuard( m_aMutex );
m_CcRecipients = aCcRecipient;
}
Sequence< OUString > SAL_CALL CmdMailMsg::getCcRecipient( )
{
-MutexGuard aGuard( m_aMutex );
+std::scoped_lock aGuard( m_aMutex );
return m_CcRecipients;
}
void SAL_CALL CmdMailMsg::setBccRecipient( const Sequence< OUString >&
aBccRecipient )
{
-MutexGuard aGuard( m_aMutex );
+std::scoped_lock aGuard( m_aMutex );
m_BccRecipients = aBccRecipient;
}
Sequence< OUString > SAL_CALL CmdMailMsg::getBccRecipient( )
{
-MutexGuard aGuard( m_aMutex );
+std::scoped_lock aGuard( m_aMutex );
return m_BccRecipients;
}
void SAL_CALL CmdMailMsg::setOriginator( const OUString& aOriginator )
{
-MutexGuard aGuard( m_aMutex );
+std::scoped_lock aGuard( m_aMutex );
m_aOriginator = aOriginator;
}
OUString SAL_CALL CmdMailMsg::getOriginator( )
{
-MutexGuard aGuard( m_aMutex );
+std::scoped_lock aGuard( m_aMutex );
return m_aOriginator;
}
void SAL_CALL CmdMailMsg::setSubject( const OUString& aSubject )
{
-MutexGuard aGuard( m_aMutex );
+std::scoped_lock aGuard( m_aMutex );
m_aSubject = aSubject;
}
OUString SAL_CALL CmdMailMsg::getSubject( )
{
-MutexGuard aGuard( m_aMutex );
+std::scoped_lock aGuard( m_aMutex );
return m_aSubject;
}
void SAL_CALL CmdMailMsg::setAttachement( const Sequence< OUString >&
aAttachment )
{
-MutexGuard aGuard( m_aMutex );
+std::scoped_lock aGuard( m_aMutex );
m_Attachments = aAttachment;
}
Sequence< OUString > SAL_CALL CmdMailMsg::getAttachement( )
{
-MutexGuard aGuard( m_aMutex );
+std::scoped_lock aGuard( m_aMutex );
return m_Attachments;
}
Any SAL_CALL CmdMailMsg::getByName( const OUString& aName )
{
-MutexGuard aGuard( m_aMutex );
+std::scoped_lock aGuard( m_aMutex );
if( aName == "body" && !m_aBody.isEmpty() )
return makeAny( m_aBody );
@@ -142,7 +141,7 @@ Any SAL_CALL CmdMailMsg::getByName( const OUString& aName )
Sequence< OUString > SAL_CALL CmdMailMsg::getElementNames( )
{
-MutexGuard aGuard( m_aMutex );
+std::scoped_lock aGuard( m_aMutex );
sal_Int32 nItems = 0;
Sequence< OUString > aRet( 7 );
@@ -174,7 +173,7 @@ Sequence< OUString > SAL_CALL CmdMailMsg::getElementNames(
)
sal_Bool SAL_CALL CmdMailMsg::hasByName( const OUString& aName )
{
-MutexGuard aGuard( m_aMutex );
+std::scoped_lock aGuard( m_aMutex );
if( aName == "body" && !m_aBody.isEmpty() )
return true;
diff --git a/shell/source/cmdmail/cmdmailmsg.hxx
b/shell/source/cmdmail/cmdmailmsg.hxx
index 43e40c1abf77..b481403953a5 100644
--- a/shell/source/cmdmail/cmdmailmsg.hxx
+++ b/shell/source/cmdmail/cmdmailmsg.hxx
@@ -20,6 +20,7 @@
#ifndef INCLUDED_SHELL_SOURCE_CMDMAIL_CMDMAILMSG_HXX
#define INCLUDED_SHELL_SOURCE_CMDMAIL_CMDMAILMSG_HXX
+#include
#include
#include
@@ -41,7 +42,7 @@ class CmdMailMsg :
css::uno::Sequence< OUString > m_BccRecipients;
css::uno::Sequence< OUString > m_Attachments;
-::osl::Mutexm_aMutex;
Re: Intended behavior for wrap "parallel" for custom shapes?
On 20.05.2021 0:01, Regina Henschel wrote: Take a text, insert a custom shape "Circle Pie", and set the wrap mode to "Parallel". Make sure, "Contour" is off. The pie is drawn into a free, rectangular area and the text wraps around this area. Drag the angle handles to make the pie a small sector. The free area becomes smaller, so that it remains tight to the sector. This is the behavior in LibreOffice since version 6.1, about April 2018. In versions before, the free area was always as large as the underlying circle of the sector. Is the new way an error or is it the intended behavior? I would suggest to reverse-bibisect the change in 6.1, and from the changing commit it would be likely more obvious if that was intended. See https://bibisect.libreoffice.org/. -- Best regards, Mike Kaganski ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: editeng/source
editeng/source/editeng/impedit3.cxx |3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit 825673eac77e2ccef29cfe2d9a1f375c6f5606d7
Author: Mike Kaganski
AuthorDate: Thu May 20 10:49:14 2021 +0200
Commit: Mike Kaganski
CommitDate: Thu May 20 11:50:42 2021 +0200
This check is redundant here
The check immediately above this guarantees that
!rParaPortion.IsInvalid() may only be true when
rParaPortion.MustRepaint() is true.
Change-Id: Icedeac87b3b8125997640d330b9612eed2cb5095
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115834
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
diff --git a/editeng/source/editeng/impedit3.cxx
b/editeng/source/editeng/impedit3.cxx
index 454f65286416..9576d079574f 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -383,8 +383,7 @@ void ImpEditEngine::FormatDoc()
if ( rParaPortion.MustRepaint() || ( rParaPortion.IsInvalid() &&
rParaPortion.IsVisible() ) )
{
// No formatting should be necessary for MustRepaint()!
-if ( ( rParaPortion.MustRepaint() && !rParaPortion.IsInvalid() )
-|| CreateLines( nPara, nY ) )
+if ( !rParaPortion.IsInvalid() || CreateLines( nPara, nY ) )
{
if ( !bGrow && GetTextRanger() )
{
___
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/unx
vcl/unx/gtk3/gtk3gtkinst.cxx |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 2811b7cb66e0bcbeb9c69e1b6b51ee30642567c1 Author: Caolán McNamara AuthorDate: Wed May 19 09:46:54 2021 +0100 Commit: Michael Stahl CommitDate: Thu May 20 11:29:58 2021 +0200 tdf#142370 a null response callback should be acceptable commit 7f032b2f16fad56beea1df826eb59c6f85c71268 Date: Sat Apr 3 01:24:30 2021 -0500 tdf#127533 Make Tip-of-the-Day dialog non-modal and allow multiple tips to open calls StartExecuteAsync(nullptr) so there is no callback function for the response which is a little unusual. The generic backend protects against a null callback hidden behind maEndCtx.isSet() before calling aEndCtx.maEndDialogFn() where isSet() checks for a null maEndDialogFn() so do the same for the gtk backend. Change-Id: Ib5346be37bfba035a00649ff7fb1d66532739721 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115788 Tested-by: Jenkins Reviewed-by: Michael Stahl diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx index f067c92b4410..2d4dc36ce5fe 100644 --- a/vcl/unx/gtk3/gtk3gtkinst.cxx +++ b/vcl/unx/gtk3/gtk3gtkinst.cxx @@ -7037,7 +7037,8 @@ void GtkInstanceDialog::asyncresponse(gint ret) m_nCancelSignalId = 0; m_nSignalDeleteId = 0; -aFunc(GtkToVcl(ret)); +if (aFunc) +aFunc(GtkToVcl(ret)); if (nResponseSignalId) g_signal_handler_disconnect(m_pDialog, nResponseSignalId); ___ 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' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 4fc26703f86e549da8facbe5085f59a9197c9699 Author: Stephan Bergmann AuthorDate: Wed Jan 20 16:06:59 2021 +0100 Commit: Tor Lillqvist CommitDate: Thu May 20 11:19:19 2021 +0200 Avoid Clang -Werror,-Wunused-command-line-argument > [CXX] bridges/source/cpp_uno/gcc3_linux_aarch64/callvirtualfunction.cxx > clang-12: error: argument unused during compilation: '-fno-stack-clash-protection' [-Werror,-Wunused-command-line-argument] as seen e.g. on macOS 11.1 ARM64 when building against Clang 12 trunk. Clang supports -fstack-clash-protection on > $ clang --target=x86_64-unknown-linux-gnu -fstack-clash-protection -fsyntax-only -x c - $ clang --target=aarch64-unknown-linux-gnu -fstack-clash-protection -fsyntax-only -x c - clang-12: warning: argument unused during compilation: '-fstack-clash-protection' [-Wunused-command-line-argument] or > $ clang --target=arm64-apple-macosx11.0.0 -fstack-clash-protection -fsyntax-only -x c - clang-12: warning: argument unused during compilation: '-fstack-clash-protection' [-Wunused-command-line-argument] Change-Id: I98625bb7ed37bf00e97634c1c8d1f87fe3263af9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109719 Tested-by: Jenkins Reviewed-by: Stephan Bergmann Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115831 Tested-by: Tor Lillqvist Reviewed-by: Tor Lillqvist diff --git a/configure.ac b/configure.ac index 08daf37b602c..1675bdd53c07 100644 --- a/configure.ac +++ b/configure.ac @@ -6324,7 +6324,7 @@ HAVE_GCC_STACK_CLASH_PROTECTION= if test "$GCC" = "yes" -o "$COM_IS_CLANG" = TRUE; then AC_MSG_CHECKING([whether $CC_BASE supports -fstack-clash-protection]) save_CFLAGS=$CFLAGS -CFLAGS="$CFLAGS -fstack-clash-protection" +CFLAGS="$CFLAGS -Werror -fstack-clash-protection" AC_LINK_IFELSE( [AC_LANG_PROGRAM(, [[return 0;]])], [AC_MSG_RESULT([yes]); HAVE_GCC_STACK_CLASH_PROTECTION=TRUE], ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/tags/co-6.4-39'
Tag 'co-6.4-39' created by Andras Timar at 2021-05-20 08:53 + co-6.4-39 Changes since cp-6.4-37-61: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Changes to 'refs/tags/co-6.4-39'
Tag 'co-6.4-39' created by Andras Timar at 2021-05-20 08:53 + co-6.4-39 Changes since cp-6.4-23: Andras Timar (1): Translation update --- source/ar/cui/messages.po | 130 source/ar/dictionaries/da_DK.po| 24 source/ar/officecfg/registry/data/org/openoffice/Office/UI.po | 24 source/ar/svtools/messages.po | 44 source/ar/svx/messages.po | 502 - source/ar/sw/messages.po | 405 source/as/cui/messages.po | 106 source/as/dictionaries/da_DK.po| 18 source/as/officecfg/registry/data/org/openoffice/Office/UI.po | 12 source/as/svtools/messages.po | 42 source/as/svx/messages.po | 472 source/as/sw/messages.po | 385 source/ast/cui/messages.po | 108 source/ast/dictionaries/da_DK.po | 18 source/ast/officecfg/registry/data/org/openoffice/Office/UI.po | 18 source/ast/svtools/messages.po | 42 source/ast/svx/messages.po | 485 - source/ast/sw/messages.po | 387 source/bg/cui/messages.po | 106 source/bg/dictionaries/da_DK.po| 24 source/bg/officecfg/registry/data/org/openoffice/Office/UI.po | 20 source/bg/svtools/messages.po | 42 source/bg/svx/messages.po | 465 source/bg/sw/messages.po | 385 source/bn-IN/cui/messages.po | 106 source/bn-IN/dictionaries/da_DK.po | 18 source/bn-IN/officecfg/registry/data/org/openoffice/Office/UI.po | 12 source/bn-IN/svtools/messages.po | 42 source/bn-IN/svx/messages.po | 482 source/bn-IN/sw/messages.po| 386 source/br/cui/messages.po | 106 source/br/dictionaries/da_DK.po| 18 source/br/officecfg/registry/data/org/openoffice/Office/UI.po | 12 source/br/svtools/messages.po | 42 source/br/svx/messages.po | 487 - source/br/sw/messages.po | 385 source/ca-valencia/cui/messages.po | 106 source/ca-valencia/dictionaries/da_DK.po | 18 source/ca-valencia/officecfg/registry/data/org/openoffice/Office/UI.po | 12 source/ca-valencia/svtools/messages.po | 42 source/ca-valencia/svx/messages.po | 471 source/ca-valencia/sw/messages.po | 385 source/ca/cui/messages.po | 106 source/ca/dictionaries/da_DK.po| 24 source/ca/officecfg/registry/data/org/openoffice/Office/UI.po | 20 source/ca/svtools/messages.po | 42 source/ca/svx/messages.po | 471 source/ca/sw/messages.po | 385 source/cs/cui/messages.po | 106 source/cs/dictionaries/da_DK.po| 24 source/cs/officecfg/registry/data/org/openoffice/Office/UI.po | 20 source/cs/svtools/messages.po | 42 source/cs/svx/messages.po | 465 source/cs/sw/messages.po | 385 source/cy/cui/messages.po | 106 source/cy/dictionaries/da_DK.po| 24 source/cy/officecfg/registry/data/org/openoffice/Office/UI.po | 20 source/cy/svtools/messages.po | 42 source/cy/svx/messages.po | 467 source/cy/sw/messages.po | 385 source/da/cui/messages.po
[Libreoffice-commits] help.git: Changes to 'refs/tags/co-6.4-39'
Tag 'co-6.4-39' created by Andras Timar at 2021-05-20 08:53 + co-6.4-39 Changes since cp-6.4-branch-point-11: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/co-6.4-39'
Tag 'co-6.4-39' created by Andras Timar at 2021-05-20 08:53 + co-6.4-39 Changes since co-6.4-20: Andras Timar (1): update Danish dictionary --- da_DK/README_da_DK.txt |4 da_DK/da_DK.aff| 3401 da_DK/da_DK.dic|288016 +++-- da_DK/description.xml |9 4 files changed, 139245 insertions(+), 152185 deletions(-) --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/xmloff sw/source xmloff/source
include/xmloff/txtparae.hxx |5 +-
sw/source/filter/xml/xmltexte.cxx | 67 ++
xmloff/source/text/txtflde.cxx|2 -
xmloff/source/text/txtparae.cxx | 26 +++---
4 files changed, 30 insertions(+), 70 deletions(-)
New commits:
commit a25385e0d8027d7257ab95a4b787404dfca59913
Author: Noel Grandin
AuthorDate: Thu May 20 10:08:30 2021 +0200
Commit: Noel Grandin
CommitDate: Thu May 20 10:47:35 2021 +0200
simplify some XMLPropertyState memory management
which fixes a leak if some of the code throws an exception
Change-Id: Ic89060e7951060458ffe7ee5b6fe51cd076ef19b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115830
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/xmloff/txtparae.hxx b/include/xmloff/txtparae.hxx
index 2495f0f504d0..3a7ca544d358 100644
--- a/include/xmloff/txtparae.hxx
+++ b/include/xmloff/txtparae.hxx
@@ -29,6 +29,7 @@
#include
#include
#include
+#include
#include
#include
@@ -385,14 +386,14 @@ public:
void Add(
XmlStyleFamily nFamily,
const css::uno::Reference< css::beans::XPropertySet > & rPropSet,
-const XMLPropertyState** pAddState = nullptr, bool bDontSeek = false );
+const o3tl::span aAddStates = {}, bool bDontSeek =
false );
/// find style name for specified family and parent
OUString Find(
XmlStyleFamily nFamily,
const css::uno::Reference< css::beans::XPropertySet > & rPropSet,
const OUString& rParent,
-const XMLPropertyState** pAddState = nullptr ) const;
+const o3tl::span aAddStates = {} ) const;
static SvXMLExportPropertyMapper *CreateShapeExtPropMapper(
SvXMLExport& rExport );
diff --git a/sw/source/filter/xml/xmltexte.cxx
b/sw/source/filter/xml/xmltexte.cxx
index c883f4f5528a..b9e3ac9fa03d 100644
--- a/sw/source/filter/xml/xmltexte.cxx
+++ b/sw/source/filter/xml/xmltexte.cxx
@@ -115,19 +115,17 @@ static void lcl_addURL ( SvXMLExport &rExport, const
OUString &rURL,
static void lcl_addAspect(
const svt::EmbeddedObjectRef& rObj,
-const XMLPropertyState **pStates,
+std::vector& rStates,
const rtl::Reference < XMLPropertySetMapper >& rMapper )
{
sal_Int64 nAspect = rObj.GetViewAspect();
if ( nAspect )
-{
-*pStates = new XMLPropertyState( rMapper->FindEntryIndex(
CTF_OLE_DRAW_ASPECT ), uno::makeAny( nAspect ) );
-}
+rStates.emplace_back( rMapper->FindEntryIndex( CTF_OLE_DRAW_ASPECT ),
uno::makeAny( nAspect ) );
}
static void lcl_addOutplaceProperties(
const svt::EmbeddedObjectRef& rObj,
-const XMLPropertyState **pStates,
+std::vector& rStates,
const rtl::Reference < XMLPropertySetMapper >& rMapper )
{
MapMode aMode( MapUnit::Map100thMM ); // the API expects this map mode for
the embedded objects
@@ -136,21 +134,15 @@ static void lcl_addOutplaceProperties(
if( !(aSize.Width() && aSize.Height()) )
return;
-*pStates = new XMLPropertyState( rMapper->FindEntryIndex(
CTF_OLE_VIS_AREA_LEFT ), Any(sal_Int32(0)) );
-pStates++;
-
-*pStates = new XMLPropertyState( rMapper->FindEntryIndex(
CTF_OLE_VIS_AREA_TOP ), Any(sal_Int32(0)) );
-pStates++;
-
-*pStates = new XMLPropertyState( rMapper->FindEntryIndex(
CTF_OLE_VIS_AREA_WIDTH ), Any(static_cast(aSize.Width())) );
-pStates++;
-
-*pStates = new XMLPropertyState( rMapper->FindEntryIndex(
CTF_OLE_VIS_AREA_HEIGHT ), Any(static_cast(aSize.Height())) );
+rStates.emplace_back( rMapper->FindEntryIndex( CTF_OLE_VIS_AREA_LEFT ),
Any(sal_Int32(0)) );
+rStates.emplace_back( rMapper->FindEntryIndex( CTF_OLE_VIS_AREA_TOP ),
Any(sal_Int32(0)) );
+rStates.emplace_back( rMapper->FindEntryIndex( CTF_OLE_VIS_AREA_WIDTH ),
Any(static_cast(aSize.Width())) );
+rStates.emplace_back( rMapper->FindEntryIndex( CTF_OLE_VIS_AREA_HEIGHT ),
Any(static_cast(aSize.Height())) );
}
static void lcl_addFrameProperties(
const uno::Reference < embed::XEmbeddedObject >& xObj,
-const XMLPropertyState **pStates,
+std::vector& rStates,
const rtl::Reference < XMLPropertySetMapper >& rMapper )
{
if ( !::svt::EmbeddedObjectRef::TryRunningState( xObj ) )
@@ -185,24 +177,13 @@ static void lcl_addFrameProperties(
aAny >>= nHeight;
if( !bIsAutoScroll )
-{
-*pStates = new XMLPropertyState( rMapper->FindEntryIndex(
CTF_FRAME_DISPLAY_SCROLLBAR ), makeAny(bIsScrollingMode) );
-pStates++;
-}
+rStates.emplace_back( rMapper->FindEntryIndex(
CTF_FRAME_DISPLAY_SCROLLBAR ), makeAny(bIsScrollingMode) );
if( !bIsAutoBorder )
-{
-*pStates = new XMLPropertyState( rMapper->FindEntryIndex(
CTF_FRAME_DISPLAY_BORDER ), makeAny(bIsBorderSet) );
-pStates++;
-}
+rStates.emplace_back( rMapper->FindEntryIndex(
CT
[Libreoffice-commits] core.git: svx/source sw/source
svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx |5
++---
svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx |2 +-
sw/source/ui/config/mailconfigpage.cxx|8
+++-
3 files changed, 6 insertions(+), 9 deletions(-)
New commits:
commit a69cc693fee8581d1612e79be13e0234ad72cd6e
Author: Caolán McNamara
AuthorDate: Wed May 19 20:55:17 2021 +0100
Commit: Caolán McNamara
CommitDate: Thu May 20 10:43:43 2021 +0200
use toggle instead of click for RadioButton
only listen for one toggle for the button grouping
Change-Id: Ie977045288906791319d7df30b3d7737253e3671
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115828
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git
a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx
b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx
index 33b8c27fa913..5a693a90cc76 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx
@@ -391,8 +391,7 @@
ChineseDictionaryDialog::ChineseDictionaryDialog(weld::Window* pParent)
m_xED_Mapping->connect_changed( LINK( this, ChineseDictionaryDialog,
EditFieldsHdl ) );
m_xLB_Property->connect_changed( LINK( this, ChineseDictionaryDialog,
EditFieldsListBoxHdl ) );
-m_xRB_To_Simplified->connect_clicked( LINK( this, ChineseDictionaryDialog,
DirectionHdl ) );
-m_xRB_To_Traditional->connect_clicked( LINK( this,
ChineseDictionaryDialog, DirectionHdl ) );
+m_xRB_To_Simplified->connect_toggled( LINK( this, ChineseDictionaryDialog,
DirectionHdl ) );
m_xCT_DictionaryToSimplified->connect_changed( LINK( this,
ChineseDictionaryDialog, MappingSelectHdl ));
m_xCT_DictionaryToTraditional->connect_changed( LINK( this,
ChineseDictionaryDialog, MappingSelectHdl ));
@@ -424,7 +423,7 @@ void
ChineseDictionaryDialog::setDirectionAndTextConversionOptions( bool bDirect
updateAfterDirectionChange();
}
-IMPL_LINK_NOARG(ChineseDictionaryDialog, DirectionHdl, weld::Button&, void)
+IMPL_LINK_NOARG(ChineseDictionaryDialog, DirectionHdl, weld::ToggleButton&,
void)
{
updateAfterDirectionChange();
}
diff --git
a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx
b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx
index ee179dd92e58..f333545e479f 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx
@@ -108,7 +108,7 @@ public:
virtual short run() override;
private:
-DECL_LINK( DirectionHdl, weld::Button&, void );
+DECL_LINK( DirectionHdl, weld::ToggleButton&, void );
DECL_LINK( EditFieldsHdl, weld::Entry&, void );
DECL_LINK( EditFieldsListBoxHdl, weld::ComboBox&, void );
DECL_LINK( MappingSelectHdl, weld::TreeView&, void );
diff --git a/sw/source/ui/config/mailconfigpage.cxx
b/sw/source/ui/config/mailconfigpage.cxx
index e51d301951af..81bebf9c0253 100644
--- a/sw/source/ui/config/mailconfigpage.cxx
+++ b/sw/source/ui/config/mailconfigpage.cxx
@@ -94,7 +94,7 @@ class SwAuthenticationSettingsDialog : public
SfxDialogController
DECL_LINK(OKHdl_Impl, weld::Button&, void);
DECL_LINK(CheckBoxHdl_Impl, weld::ToggleButton&, void);
DECL_LINK(RadioButtonHdl_Impl, weld::ToggleButton&, void);
-DECL_LINK(InServerHdl_Impl, weld::Button&, void);
+DECL_LINK(InServerHdl_Impl, weld::ToggleButton&, void);
public:
SwAuthenticationSettingsDialog(weld::Window* pParent,
SwMailMergeConfigItem& rItem);
@@ -391,9 +391,7 @@
SwAuthenticationSettingsDialog::SwAuthenticationSettingsDialog(
m_xSeparateAuthenticationRB->connect_toggled( aRBLink );
m_xSMTPAfterPOPRB->connect_toggled( aRBLink );
m_xOKPB->connect_clicked( LINK( this, SwAuthenticationSettingsDialog,
OKHdl_Impl));
-Link aInServerLink = LINK( this,
SwAuthenticationSettingsDialog, InServerHdl_Impl );
-m_xPOP3RB->connect_clicked( aInServerLink );
-m_xIMAPRB->connect_clicked( aInServerLink );
+m_xPOP3RB->connect_toggled(LINK(this, SwAuthenticationSettingsDialog,
InServerHdl_Impl));
m_xAuthenticationCB->set_active(m_rConfigItem.IsAuthentication());
if (m_rConfigItem.IsSMTPAfterPOP())
@@ -474,7 +472,7 @@ IMPL_LINK_NOARG(SwAuthenticationSettingsDialog,
RadioButtonHdl_Impl, weld::Toggl
m_xInPasswordED->set_sensitive(bNotSeparate);
}
-IMPL_LINK_NOARG( SwAuthenticationSettingsDialog, InServerHdl_Impl,
weld::Button&, void)
+IMPL_LINK_NOARG( SwAuthenticationSettingsDialog, InServerHdl_Impl,
weld::ToggleButton&, void)
{
bool bPOP = m_xPOP3RB->get_active();
m_rConfigItem.SetInServerPOP(bPOP);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mai
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - sw/qa sw/source
sw/qa/core/txtnode/data/title-field-invalidate.fodt | 23 ++
sw/qa/core/txtnode/txtnode.cxx | 70
sw/source/core/txtnode/atrfld.cxx | 19 +
3 files changed, 111 insertions(+), 1 deletion(-)
New commits:
commit 750d379c4957378f886c38b5a29c56e6a9fa5d8c
Author: Miklos Vajna
AuthorDate: Tue May 18 14:33:53 2021 +0200
Commit: Miklos Vajna
CommitDate: Thu May 20 10:31:50 2021 +0200
sw: fix not needed invalidation of title field on each keypress
Type a character, SwDocShell::DoFlushDocInfo() is called because the
number of characters changed, and that rapaints all title fields.
This happens as SwFormatField::UpdateTextNode() calls
SwTextField::ExpandTextField() with bForceNotify=true, because that was
needed for conditional text in commit
cd94a84b89c476760ad74bf088a5d6f8ba4ce209 (125044: - use field's content
cache on construction only, 2014-06-13).
Fix the problem by not forcing notifications for title fields in
SwFormatField::UpdateTextNode(): SwTextField::ExpandTextField() will
send a notification if the expend result differs without forcing as
well.
(cherry picked from commit 0a32630d11ebdb8b8218faa066c72582ef2f300d)
Change-Id: I5e46ab6aef33ff5e348d40b8644bcc9cf353c326
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115779
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Miklos Vajna
diff --git a/sw/qa/core/txtnode/data/title-field-invalidate.fodt
b/sw/qa/core/txtnode/data/title-field-invalidate.fodt
new file mode 100644
index ..e47129538fa9
--- /dev/null
+++ b/sw/qa/core/txtnode/data/title-field-invalidate.fodt
@@ -0,0 +1,23 @@
+
+http://purl.org/dc/elements/1.1/";
xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0"
xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
office:mimetype="application/vnd.oasis.opendocument.text">
+
+mytitle
+
+
+
+
+
+
+
+
+
+mytitle
+
+
+
+
+
+ body text
+
+
+
diff --git a/sw/qa/core/txtnode/txtnode.cxx b/sw/qa/core/txtnode/txtnode.cxx
index ce55e517e196..ff258d5c13b8 100644
--- a/sw/qa/core/txtnode/txtnode.cxx
+++ b/sw/qa/core/txtnode/txtnode.cxx
@@ -9,8 +9,13 @@
#include
+#include
+#include
+#include
#include
+#include
+#include
#include
#include
#include
@@ -84,6 +89,71 @@ CPPUNIT_TEST_FIXTURE(SwCoreTxtnodeTest, testTextBoxNodeSplit)
pWrtShell->SplitNode();
}
+namespace
+{
+struct ViewCallback
+{
+int m_nInvalidations = 0;
+
+static void callback(int nType, const char* pPayload, void* pData);
+void callbackImpl(int nType, const char* pPayload);
+};
+
+void ViewCallback::callback(int nType, const char* pPayload, void* pData)
+{
+static_cast(pData)->callbackImpl(nType, pPayload);
+}
+
+void ViewCallback::callbackImpl(int nType, const char* /*pPayload*/)
+{
+switch (nType)
+{
+case LOK_CALLBACK_INVALIDATE_TILES:
+{
+++m_nInvalidations;
+}
+break;
+}
+}
+}
+
+CPPUNIT_TEST_FIXTURE(SwCoreTxtnodeTest, testTitleFieldInvalidate)
+{
+// Set up LOK to track invalidations.
+comphelper::LibreOfficeKit::setActive(true);
+
+// Given a document with a title field:
+load(DATA_DIRECTORY, "title-field-invalidate.fodt");
+SwXTextDocument* pTextDoc =
dynamic_cast(mxComponent.get());
+pTextDoc->initializeForTiledRendering({});
+SwDocShell* pShell = pTextDoc->GetDocShell();
+SwDoc* pDoc = pShell->GetDoc();
+SwWrtShell* pWrtShell = pShell->GetWrtShell();
+pWrtShell->SttEndDoc(/*bStt=*/false);
+ViewCallback aCallback;
+
pWrtShell->GetSfxViewShell()->registerLibreOfficeKitViewCallback(&ViewCallback::callback,
+
&aCallback);
+Scheduler::ProcessEventsToIdle();
+aCallback.m_nInvalidations = 0;
+
+// When typing to the document:
+pWrtShell->Insert("x");
+
+// Then make sure that only the text frame at the cursor is invalidated:
+pDoc->getIDocumentStatistics().GetUpdatedDocStat(/*bCompleteAsync=*/true,
/*bFields=*/false);
+// Without the accompanying fix in place, this test would have failed with:
+// - Expected: 1
+// - Actual : 2
+// i.e. the footer was also invalidated on each keypress.
+CPPUNIT_ASSERT_EQUAL(1, aCallback.m_nInvalidations);
+
+// Tear down LOK.
+pWrtShell->GetSfxViewShell()->registerLibreOfficeKitViewCallback(nullptr,
nullptr);
+mxComponent->dispose();
+mxComponent.clear();
+comphelper::LibreOfficeKit::setActive(false);
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/txtnode/atrfld.cxx
b/sw/source/core/txtnode/atrfld.cxx
index aa4dab94b8e5..bb95a8799081 100644
--- a/sw/source/core/txtnode/atrfld.cxx
+++ b/sw/source/core/txtnode/atrfld
[Libreoffice-commits] core.git: Changes to 'private/mikekaganski/multicolumn'
New branch 'private/mikekaganski/multicolumn' available with the following commits: commit 9699d0f12bb7e3ee84a44090edcaf5a013267799 Author: Mike Kaganski Date: Tue May 18 06:47:38 2021 +0300 Balance the text in columns on overflow Change-Id: Ia7ad030427bebba1dded5ba364559bed16263aa4 commit 610785d6a93b86c60aca20c07f3e872873ff6117 Author: Mike Kaganski Date: Mon May 17 12:30:20 2021 +0300 editengine-columns: Use common iteration code with callbacks Change-Id: I1ee1caf52e7eef61addc412306b641dff0629738 commit 728f3178ce7cb6bbc5c47d20cc0687d03b86fec3 Author: Mike Kaganski Date: Thu May 13 16:50:27 2021 +0300 editengine-columns: properly position columns in edit mode Change-Id: I7e63293e5814b281ceec8a9632e696322d3629e8 commit feb58e4fd3360fd88e84c9c5448c429736c8b3df Author: Mike Kaganski Date: Thu May 6 14:14:56 2021 +0300 editengine-columns: correct render in ImpEditEngine::Paint Change-Id: I33cbb978deb974b314d36fda8674186a03991107 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - sw/qa sw/source
sw/qa/core/txtnode/data/title-field-invalidate.fodt | 23 ++
sw/qa/core/txtnode/txtnode.cxx | 70
sw/source/core/txtnode/atrfld.cxx | 18 -
3 files changed, 110 insertions(+), 1 deletion(-)
New commits:
commit 3a86bbd5e06d0fb7c057c761e924111e6499d20e
Author: Miklos Vajna
AuthorDate: Tue May 18 14:33:53 2021 +0200
Commit: Mike Kaganski
CommitDate: Thu May 20 09:15:15 2021 +0200
sw: fix not needed invalidation of title field on each keypress
Type a character, SwDocShell::DoFlushDocInfo() is called because the
number of characters changed, and that rapaints all title fields.
This happens as SwFormatField::UpdateTextNode() calls
SwTextField::ExpandTextField() with bForceNotify=true, because that was
needed for conditional text in commit
cd94a84b89c476760ad74bf088a5d6f8ba4ce209 (125044: - use field's content
cache on construction only, 2014-06-13).
Fix the problem by not forcing notifications for title fields in
SwFormatField::UpdateTextNode(): SwTextField::ExpandTextField() will
send a notification if the expend result differs without forcing as
well.
(cherry picked from commit 0a32630d11ebdb8b8218faa066c72582ef2f300d)
Conflicts:
sw/qa/core/txtnode/txtnode.cxx
sw/source/core/txtnode/atrfld.cxx
Change-Id: I5e46ab6aef33ff5e348d40b8644bcc9cf353c326
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115783
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Mike Kaganski
diff --git a/sw/qa/core/txtnode/data/title-field-invalidate.fodt
b/sw/qa/core/txtnode/data/title-field-invalidate.fodt
new file mode 100644
index ..e47129538fa9
--- /dev/null
+++ b/sw/qa/core/txtnode/data/title-field-invalidate.fodt
@@ -0,0 +1,23 @@
+
+http://purl.org/dc/elements/1.1/";
xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0"
xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
office:mimetype="application/vnd.oasis.opendocument.text">
+
+mytitle
+
+
+
+
+
+
+
+
+
+mytitle
+
+
+
+
+
+ body text
+
+
+
diff --git a/sw/qa/core/txtnode/txtnode.cxx b/sw/qa/core/txtnode/txtnode.cxx
index eb675c6e77b8..56040043ed25 100644
--- a/sw/qa/core/txtnode/txtnode.cxx
+++ b/sw/qa/core/txtnode/txtnode.cxx
@@ -14,8 +14,13 @@
#include
#include
#include
+#include
+#include
+#include
#include
+#include
+#include
#include
#include
#include
@@ -89,6 +94,71 @@ CPPUNIT_TEST_FIXTURE(SwCoreTxtnodeTest, testTextBoxNodeSplit)
pWrtShell->SplitNode();
}
+namespace
+{
+struct ViewCallback
+{
+int m_nInvalidations = 0;
+
+static void callback(int nType, const char* pPayload, void* pData);
+void callbackImpl(int nType, const char* pPayload);
+};
+
+void ViewCallback::callback(int nType, const char* pPayload, void* pData)
+{
+static_cast(pData)->callbackImpl(nType, pPayload);
+}
+
+void ViewCallback::callbackImpl(int nType, const char* /*pPayload*/)
+{
+switch (nType)
+{
+case LOK_CALLBACK_INVALIDATE_TILES:
+{
+++m_nInvalidations;
+}
+break;
+}
+}
+}
+
+CPPUNIT_TEST_FIXTURE(SwCoreTxtnodeTest, testTitleFieldInvalidate)
+{
+// Set up LOK to track invalidations.
+comphelper::LibreOfficeKit::setActive(true);
+
+// Given a document with a title field:
+load(DATA_DIRECTORY, "title-field-invalidate.fodt");
+SwXTextDocument* pTextDoc =
dynamic_cast(mxComponent.get());
+pTextDoc->initializeForTiledRendering({});
+SwDocShell* pShell = pTextDoc->GetDocShell();
+SwDoc* pDoc = pShell->GetDoc();
+SwWrtShell* pWrtShell = pShell->GetWrtShell();
+pWrtShell->SttEndDoc(/*bStt=*/false);
+ViewCallback aCallback;
+
pWrtShell->GetSfxViewShell()->registerLibreOfficeKitViewCallback(&ViewCallback::callback,
+
&aCallback);
+Scheduler::ProcessEventsToIdle();
+aCallback.m_nInvalidations = 0;
+
+// When typing to the document:
+pWrtShell->Insert("x");
+
+// Then make sure that only the text frame at the cursor is invalidated:
+pDoc->getIDocumentStatistics().GetUpdatedDocStat(/*bCompleteAsync=*/true,
/*bFields=*/false);
+// Without the accompanying fix in place, this test would have failed with:
+// - Expected: 1
+// - Actual : 2
+// i.e. the footer was also invalidated on each keypress.
+CPPUNIT_ASSERT_EQUAL(1, aCallback.m_nInvalidations);
+
+// Tear down LOK.
+pWrtShell->GetSfxViewShell()->registerLibreOfficeKitViewCallback(nullptr,
nullptr);
+mxComponent->dispose();
+mxComponent.clear();
+comphelper::LibreOfficeKit::setActive(false);
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/txtnode/atrfld.cxx
b/sw/source/core/txt
