[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - vcl/source
vcl/source/treelist/treelist.cxx |4
1 file changed, 4 deletions(-)
New commits:
commit 150246a7c5a476ab78fadee4c5fe99aeb1670f83
Author: Stephan Bergmann
AuthorDate: Mon Mar 28 14:34:11 2022 +0200
Commit: Andras Timar
CommitDate: Fri Jul 7 10:27:29 2023 +0200
-Werror,-Wunused-but-set-variable
...since fb6c99f21e03afb85d00459ca1e1abb07e71d126
"loplugin:unuseddefaultparam
in svtools"
Change-Id: I08da150389bfe8dad09ca293a8f445020c3a51ed
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132208
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/vcl/source/treelist/treelist.cxx b/vcl/source/treelist/treelist.cxx
index a876b0675980..25468b2edaf9 100644
--- a/vcl/source/treelist/treelist.cxx
+++ b/vcl/source/treelist/treelist.cxx
@@ -675,8 +675,6 @@ SvTreeListEntry* SvTreeList::PrevVisible(const SvListView*
pView, SvTreeListEntr
{
DBG_ASSERT(pView&,"PrevVis:View/Entry?");
-sal_uInt16 nDepth = 0;
-
SvTreeListEntries* pActualList = >pParent->m_Children;
sal_uInt32 nActualPos = pActEntry->GetChildListPos();
@@ -686,7 +684,6 @@ SvTreeListEntry* SvTreeList::PrevVisible(const SvListView*
pView, SvTreeListEntr
while( pView->IsExpanded(pActEntry) )
{
pActualList = >m_Children;
-nDepth++;
pActEntry = pActualList->back().get();
}
return pActEntry;
@@ -698,7 +695,6 @@ SvTreeListEntry* SvTreeList::PrevVisible(const SvListView*
pView, SvTreeListEntr
pActEntry = pActEntry->pParent;
if ( pActEntry )
{
-nDepth--;
return pActEntry;
}
return nullptr;
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - vcl/source
vcl/source/window/floatwin.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit b77112aa56bd402b5d02dafaf41f88822ffddca9
Author: Henry Castro
AuthorDate: Tue Jun 6 11:09:04 2023 -0400
Commit: Caolán McNamara
CommitDate: Wed Jun 7 16:44:50 2023 +0200
lok: vcl: fix "ImplConvertToAbsPos" function
The conversion to absolute position is ignored for mirrored graphics,
otherwise, the popup window will be closed after the mouse up event.
Signed-off-by: Henry Castro
Change-Id: I2cb101b07f1aa79ab8aa605637b276ad3a56ce88
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152681
Tested-by: Caolán McNamara
Reviewed-by: Caolán McNamara
diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx
index 094a3ef184a2..4eeefd382b63 100644
--- a/vcl/source/window/floatwin.cxx
+++ b/vcl/source/window/floatwin.cxx
@@ -485,7 +485,7 @@ Point FloatingWindow::ImplConvertToAbsPos(vcl::Window*
pReference, const Point&
const OutputDevice *pWindowOutDev = pReference->GetOutDev();
// compare coordinates in absolute screen coordinates
-if( pWindowOutDev->HasMirroredGraphics() )
+if ( pWindowOutDev->HasMirroredGraphics() &&
!comphelper::LibreOfficeKit::isActive() )
{
if(!pReference->IsRTLEnabled() )
pWindowOutDev->ReMirror( aAbsolute );
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - vcl/source
vcl/source/control/ctrl.cxx | 15 ---
1 file changed, 8 insertions(+), 7 deletions(-)
New commits:
commit 7ed760c4564834ec61ceb91f681dfc6daa1be4bd
Author: Marco Cecchetti
AuthorDate: Thu Mar 9 20:49:46 2023 +0100
Commit: Andras Timar
CommitDate: Thu Mar 9 22:20:46 2023 +
lok: some tunneled dialog control was not invalidated correctly
This patch fixes a regression for commit:
"lok: form controls: rendering and mouse event forwarding"
Change-Id: Iffb0757834a884a6c86206221660da2a24bdff17
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148564
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Andras Timar
diff --git a/vcl/source/control/ctrl.cxx b/vcl/source/control/ctrl.cxx
index 689b02f80d79..943823e8f4f5 100644
--- a/vcl/source/control/ctrl.cxx
+++ b/vcl/source/control/ctrl.cxx
@@ -491,16 +491,17 @@ Control::GetUnzoomedControlPointFont() const
void Control::LogicInvalidate(const tools::Rectangle* pRectangle)
{
-// avoid endless paint/invalidate loop in Impress
-if (comphelper::LibreOfficeKit::isTiledPainting())
-return;
-
VclPtr pParent = GetParentWithLOKNotifier();
-if (!pParent)
+if (!pParent || !dynamic_cast(GetParent()))
+{
+// if control doesn't belong to a DocWindow, the overriden base class
+// method has to be invoked
+Window::LogicInvalidate(pRectangle);
return;
+}
-// invalidate only controls that belong to a DocWindow
-if (!dynamic_cast(GetParent()))
+// avoid endless paint/invalidate loop in Impress
+if (comphelper::LibreOfficeKit::isTiledPainting())
return;
tools::Rectangle aResultRectangle;
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - vcl/source
vcl/source/window/window2.cxx | 12 +---
1 file changed, 9 insertions(+), 3 deletions(-)
New commits:
commit 8adad652f9853f54784cf8b9c99ce595e7bd4e9d
Author: Aron Budea
AuthorDate: Thu Feb 2 00:08:41 2023 +0100
Commit: Miklos Vajna
CommitDate: Thu Feb 2 07:19:13 2023 +
vcl: fix online crash in vcl::Window::IsTracking()
Crashreport signature:
program/libmergedlo.so
vcl::Window::IsTracking() const
vcl/source/window/window2.cxx:340
program/libmergedlo.so
(anonymous namespace)::LOKPostAsyncEvent(void*, void*)
sfx2/source/view/lokhelper.cxx:812
program/libmergedlo.so
LokChartHelper::postMouseEvent(int, int, int, int, int, int,
double, double)
include/rtl/ref.hxx:128
program/libmergedlo.so
SfxLokHelper::testInPlaceComponentMouseEventHit(SfxViewShell*, int,
int, int, int, int, int, double, double, bool)
sfx2/source/view/lokhelper.cxx:980
/program/libswlo.so
SwXTextDocument::postMouseEvent(int, int, int, int, int, int)
sw/source/uibase/uno/unotxdoc.cxx:3663
program/libmergedlo.so
doc_postMouseEvent
desktop/source/lib/init.cxx:4831
Change-Id: Iab7d24a901e57dc8af3fb2c77fbea3b4fdad9fb9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146483
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Miklos Vajna
diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx
index 7334d423e9bc..e16113add965 100644
--- a/vcl/source/window/window2.cxx
+++ b/vcl/source/window/window2.cxx
@@ -339,9 +339,15 @@ bool Window::IsTracking() const
{
if (!mpWindowImpl)
return false;
-return (mpWindowImpl->mbUseFrameData ?
-mpWindowImpl->mpFrameData->mpTrackWin == this :
-ImplGetSVData()->mpWinData->mpTrackWin == this);
+if (mpWindowImpl->mbUseFrameData && mpWindowImpl->mpFrameData)
+{
+return mpWindowImpl->mpFrameData->mpTrackWin == this;
+}
+if (!mpWindowImpl->mbUseFrameData && ImplGetSVData()->mpWinData)
+{
+return ImplGetSVData()->mpWinData->mpTrackWin == this;
+}
+return false;
}
void Window::StartAutoScroll( StartAutoScrollFlags nFlags )
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - vcl/source
vcl/source/window/window2.cxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit d037ad98ca75ae857a566b62e2e86a1a5e7c3590
Author: Noel Grandin
AuthorDate: Fri Jan 27 08:50:04 2023 +0200
Commit: Noel Grandin
CommitDate: Mon Jan 30 17:28:52 2023 +
fix online crash in WIndow::IsTracking
/opt/collaboraoffice/program/libmergedlo.so
vcl::Window::IsTracking() const
/home/collabora/jenkins/workspace/build_core_co-22.05_for_online_snapshot/vcl/source/window/window2.cxx:340
/opt/collaboraoffice/program/libmergedlo.so
(anonymous namespace)::LOKPostAsyncEvent(void*, void*)
/home/collabora/jenkins/workspace/build_core_co-22.05_for_online_snapshot/sfx2/source/view/lokhelper.cxx:812
/opt/collaboraoffice/program/libmergedlo.so
LokChartHelper::postMouseEvent(int, int, int, int, int, int, double,
double)
/home/collabora/jenkins/workspace/build_core_co-22.05_for_online_snapshot/include/rtl/ref.hxx:128
Change-Id: I204bac7d8f595054abe9b6e8e631c02b26e20361
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146231
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Noel Grandin
diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx
index bf8973114185..7334d423e9bc 100644
--- a/vcl/source/window/window2.cxx
+++ b/vcl/source/window/window2.cxx
@@ -337,6 +337,8 @@ void Window::EndTracking( TrackingEventFlags nFlags )
bool Window::IsTracking() const
{
+if (!mpWindowImpl)
+return false;
return (mpWindowImpl->mbUseFrameData ?
mpWindowImpl->mpFrameData->mpTrackWin == this :
ImplGetSVData()->mpWinData->mpTrackWin == this);
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - vcl/source
vcl/source/treelist/svtabbx.cxx | 13 ++---
1 file changed, 10 insertions(+), 3 deletions(-)
New commits:
commit 0ae6d51e720ea66ef6efb52d0d96f8a5fb60b595
Author: Szymon Kłos
AuthorDate: Wed Jan 4 15:28:34 2023 +0100
Commit: Szymon Kłos
CommitDate: Wed Jan 4 18:31:13 2023 +
jsdialog: don't export collapsed/expanded icons when empty
Change-Id: Iec56c11fdba066f9b62b2d5d56ad011a821e4087
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145040
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Szymon Kłos
diff --git a/vcl/source/treelist/svtabbx.cxx b/vcl/source/treelist/svtabbx.cxx
index 9d989eb8382d..ccc5c1cd2491 100644
--- a/vcl/source/treelist/svtabbx.cxx
+++ b/vcl/source/treelist/svtabbx.cxx
@@ -75,9 +75,16 @@ static void lcl_DumpEntryAndSiblings(tools::JsonWriter&
rJsonWriter,
const SvLBoxContextBmp* pBmpItem = dynamic_cast();
if (pBmpItem)
{
-auto aColumn = rJsonWriter.startStruct();
-rJsonWriter.put("collapsed",
pBmpItem->GetBitmap1().GetStock());
-rJsonWriter.put("expanded",
pBmpItem->GetBitmap2().GetStock());
+const OUString& rCollapsed =
pBmpItem->GetBitmap1().GetStock();
+const OUString& rExpanded =
pBmpItem->GetBitmap2().GetStock();
+if (!rCollapsed.trim().isEmpty() ||
!rExpanded.trim().isEmpty())
+{
+auto aColumn = rJsonWriter.startStruct();
+if (!rCollapsed.trim().isEmpty())
+rJsonWriter.put("collapsed", rCollapsed);
+if (!rExpanded.trim().isEmpty())
+rJsonWriter.put("expanded", rExpanded);
+}
}
}
}
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - vcl/source
vcl/source/gdi/pdfobjectcopier.cxx |9 +++--
1 file changed, 3 insertions(+), 6 deletions(-)
New commits:
commit 9aaf70675c0fc80641f6da6f821c2180be1ca608
Author: Aron Budea
AuthorDate: Mon Dec 19 08:49:57 2022 +0100
Commit: Dennis Francis
CommitDate: Tue Dec 20 04:39:59 2022 +
vcl: avoid unused variable warning
vcl/source/gdi/pdfobjectcopier.cxx: In member function ‘rtl::OString
vcl::PDFObjectCopier::copyExternalResources(vcl::filter::PDFObjectElement&,
const rtl::OString&, std::__debug::map&)’:
vcl/source/gdi/pdfobjectcopier.cxx:240:27: error: unused variable ‘pDict’
[-Werror=unused-variable]
240 | if (auto* pDict =
dynamic_cast(rItem.second))
| ^
Change-Id: I864210144e6154eb79a42e6cd5ceb3d5dbd39a76
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/19
Reviewed-by: Dennis Francis
Tested-by: Jenkins CollaboraOffice
diff --git a/vcl/source/gdi/pdfobjectcopier.cxx
b/vcl/source/gdi/pdfobjectcopier.cxx
index cbf3dc308c3b..fddacc2a65fd 100644
--- a/vcl/source/gdi/pdfobjectcopier.cxx
+++ b/vcl/source/gdi/pdfobjectcopier.cxx
@@ -235,13 +235,10 @@ OString
PDFObjectCopier::copyExternalResources(filter::PDFObjectElement& rPage,
auto pReference =
dynamic_cast(rItem.second);
if (!pReference)
{
-if (pKindObject)
+if (pKindObject &&
dynamic_cast(rItem.second) != nullptr)
{
-if (auto* pDict =
dynamic_cast(rItem.second))
-{
-bHasDictValue = true;
-break;
-}
+bHasDictValue = true;
+break;
}
continue;
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - vcl/source
vcl/source/gdi/pdfobjectcopier.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit cf923b7f892ee8d5c5122c7bd88cb40a2e390a56
Author: Dennis Francis
AuthorDate: Fri Dec 2 12:50:44 2022 +0530
Commit: Miklos Vajna
CommitDate: Fri Dec 16 13:48:22 2022 +
vcl: copy /Pattern resources too
Change-Id: I3d99f9083fb67c68ddee24d2d285350230533fda
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143563
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Miklos Vajna
diff --git a/vcl/source/gdi/pdfobjectcopier.cxx
b/vcl/source/gdi/pdfobjectcopier.cxx
index 999be92bd752..67f70d10f2a9 100644
--- a/vcl/source/gdi/pdfobjectcopier.cxx
+++ b/vcl/source/gdi/pdfobjectcopier.cxx
@@ -260,7 +260,7 @@ void
PDFObjectCopier::copyPageResources(filter::PDFObjectElement* pPage, OString
{
rLine.append(" /Resources <<");
static const std::initializer_list aKeys
-= { "ColorSpace", "ExtGState", "Font", "XObject", "Shading" };
+= { "ColorSpace", "ExtGState", "Font", "XObject", "Shading", "Pattern"
};
for (const auto& rKey : aKeys)
{
rLine.append(copyExternalResources(*pPage, rKey, rCopiedResources));
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - vcl/source
vcl/source/app/scheduler.cxx |6 ++
1 file changed, 6 insertions(+)
New commits:
commit 5e8b147574a3bd33800aa8589ec2aa264eaa97d9
Author: Noel Grandin
AuthorDate: Thu Nov 24 09:33:34 2022 +0200
Commit: Aron Budea
CommitDate: Fri Nov 25 14:10:39 2022 +0100
tdf#148435 - avoid strange OS/X deadlock around AnyInput.
Apparently calling AnyInput on Mac and filtering for just input, gives
you window creation / re-sizing events which then trigger idle paint
events which then deadlock if called with the scheduler lock.
So just don't do this optimisation.
Change-Id: I2b518fba607815241d3bd60407cdf51a4357aef4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143200
Tested-by: Jenkins
Reviewed-by: Noel Grandin
(cherry picked from commit 8b442d7fae17660b3665da2c1f7a084341987693)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143162
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Aron Budea
diff --git a/vcl/source/app/scheduler.cxx b/vcl/source/app/scheduler.cxx
index 5da5c2465c60..927de71c4fbb 100644
--- a/vcl/source/app/scheduler.cxx
+++ b/vcl/source/app/scheduler.cxx
@@ -419,6 +419,11 @@ void Scheduler::CallbackTaskScheduling()
break;
}
+// tdf#148435 Apparently calling AnyInput on Mac and filtering for just input,
gives
+// you window creation / re-sizing events which then trigger idle paint
+// events which then deadlock if called with the scheduler lock.
+// So since this is an optimisation, just don't do this on mac.
+#ifndef MACOSX
// Delay invoking tasks with idle priorities as long as there are user
input or repaint events
// in the OS event queue. This will often effectively compress such events
and repaint only
// once at the end, improving performance in cases such as repeated
zooming with a complex document.
@@ -430,6 +435,7 @@ void Scheduler::CallbackTaskScheduling()
pMostUrgent = nullptr;
nMinPeriod = 0;
}
+#endif
if (InfiniteTimeoutMs != nMinPeriod)
SAL_INFO("vcl.schedule",
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - vcl/source
vcl/source/window/dialog.cxx |3 +++
1 file changed, 3 insertions(+)
New commits:
commit e96352fca453d6a2f52f57c94cdd443ad3e4c0a0
Author: Gökay Şatır
AuthorDate: Wed Nov 9 15:37:43 2022 +0300
Commit: Gökay ŞATIR
CommitDate: Thu Nov 10 14:39:58 2022 +0100
Send unique window id along with other data to COOL.
Signed-off-by: Gökay Şatır
Change-Id: I9021c8218890906c0239f32503057262d7326fd4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142485
Tested-by: Jenkins
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142550
Tested-by: Jenkins CollaboraOffice
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index 8b9e11cc35d0..0579b61a76ad 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -765,6 +765,7 @@ void Dialog::StateChanged( StateChangedType nType )
std::vector aItems;
aItems.emplace_back("type", "dialog");
aItems.emplace_back("size", GetSizePixel().toString());
+aItems.emplace_back("unique_id", this->get_id().toUtf8());
if (!GetText().isEmpty())
aItems.emplace_back("title", GetText().toUtf8());
@@ -1025,6 +1026,7 @@ bool Dialog::ImplStartExecute()
// otherwise, this should make sure that the window has the
correct size.
std::vector aItems;
aItems.emplace_back("size", GetSizePixel().toString());
+aItems.emplace_back("unique_id", this->get_id().toUtf8());
pNotifier->notifyWindow(GetLOKWindowId(), "size_changed", aItems);
}
}
@@ -1392,6 +1394,7 @@ void Dialog::Resize()
{
std::vector aItems;
aItems.emplace_back("size", GetSizePixel().toString());
+aItems.emplace_back("unique_id", this->get_id().toUtf8());
pNotifier->notifyWindow(GetLOKWindowId(), "size_changed", aItems);
}
}
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - vcl/source
vcl/source/window/mouse.cxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit b763d57a023406049d2f6490a1a4b14c6a217463
Author: Miklos Vajna
AuthorDate: Mon Nov 7 10:48:06 2022 +0100
Commit: Miklos Vajna
CommitDate: Tue Nov 8 08:59:15 2022 +0100
vcl: fix crash in Window::LeaveWait()
Crashreport signature:
SIG Fatal signal received: SIGSEGV code: 128 for address: 0x0
program/libmergedlo.so
vcl::Window::LeaveWait()
vcl/source/window/mouse.cxx:640
program/../program/libsclo.so
ScSpellingEngine::ShowTableWrapDialog()
sc/source/ui/view/spelleng.cxx:315
program/libsclo.so
ScConversionEngineBase::FindNextConversionCell()
sc/source/ui/view/spelleng.cxx:168
program/../program/libsclo.so
ScSpellDialogChildWindow::GetNextWrongSentence(bool)
/opt/rh/devtoolset-10/root/usr/include/c++/10/bits/unique_ptr.h:173
Seeing that e.g. Window::GetDropTarget() also handles a disposed
vcl::Window, let's do the same here.
Change-Id: Ia4ad312ae91dfef24266c5bd45751778acbee367
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142367
Reviewed-by: Michael Meeks
Tested-by: Jenkins CollaboraOffice
diff --git a/vcl/source/window/mouse.cxx b/vcl/source/window/mouse.cxx
index 9b533b991a9e..c77391f8393a 100644
--- a/vcl/source/window/mouse.cxx
+++ b/vcl/source/window/mouse.cxx
@@ -636,6 +636,8 @@ void Window::EnterWait()
void Window::LeaveWait()
{
+if( !mpWindowImpl )
+return;
if ( mpWindowImpl->mnWaitCount )
{
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - vcl/source
vcl/source/control/edit.cxx |3 +++
1 file changed, 3 insertions(+)
New commits:
commit 7733ecdc79355aff0e0018ed6067c9c2784a
Author: Szymon Kłos
AuthorDate: Fri Oct 21 12:11:06 2022 +0200
Commit: Szymon Kłos
CommitDate: Thu Oct 27 11:49:57 2022 +0200
jsdialog: send edit widget's type information
Change-Id: I878603e18c2c0ac8b1e9a9ff7995b6c640e455b2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141619
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Szymon Kłos
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index 46d9f67dc240..b9d2be20f918 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -2919,6 +2919,9 @@ void Edit::DumpAsPropertyTree(tools::JsonWriter&
rJsonWriter)
if (!maPlaceholderText.isEmpty())
rJsonWriter.put("placeholder", maPlaceholderText);
+
+if (IsPassword())
+rJsonWriter.put("password", true);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - vcl/source
vcl/source/app/salvtables.cxx |5 +
1 file changed, 5 insertions(+)
New commits:
commit 3038c8b971940a3ff71a99e6de6cd6aa3c8ecd78
Author: Miklos Vajna
AuthorDate: Thu Sep 8 13:48:01 2022 +0200
Commit: Miklos Vajna
CommitDate: Thu Sep 8 16:32:32 2022 +0200
vcl: fix crash in SalInstanceWidget::set_busy_cursor()
Crashreport signature:
Fatal signal received: SIGSEGV code: 128 for address: 0x0
program/libmergedlo.so
vcl::Window::LeaveWait()
vcl/source/window/mouse.cxx:640
program/libsclo.so
ScSpellingEngine::ShowTableWrapDialog()
sc/source/ui/view/spelleng.cxx:315
program/libsclo.so
ScConversionEngineBase::FindNextConversionCell()
sc/source/ui/view/spelleng.cxx:168
program/libsclo.so
ScSpellDialogChildWindow::GetNextWrongSentence(bool)
/opt/rh/devtoolset-10/root/usr/include/c++/10/bits/unique_ptr.h:173
Change-Id: I298789211d6ee038bd5a9a7bff7cf9ae4f132a91
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139652
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Miklos Vajna
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index fccf9a0205f2..b122bcefbf07 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -510,6 +510,11 @@ void SalInstanceWidget::thaw()
void SalInstanceWidget::set_busy_cursor(bool bBusy)
{
+if (!m_xWidget)
+{
+return;
+}
+
if (bBusy)
m_xWidget->EnterWait();
else
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - vcl/source
vcl/source/control/button.cxx|6 +++---
vcl/source/control/fixed.cxx |6 +++---
vcl/source/control/tabctrl.cxx |2 +-
vcl/source/treelist/iconview.cxx | 11 +--
vcl/source/treelist/svtabbx.cxx | 10 +-
vcl/source/window/dialog.cxx |2 +-
vcl/source/window/layout.cxx |4 ++--
vcl/source/window/toolbox2.cxx |4 ++--
vcl/source/window/window.cxx |2 +-
9 files changed, 23 insertions(+), 24 deletions(-)
New commits:
commit 62d5622540c7251bb870a837b5ca6a836fac6f01
Author: Mike Kaganski
AuthorDate: Sun Aug 21 17:36:33 2022 +0300
Commit: Mike Kaganski
CommitDate: Mon Aug 22 12:48:32 2022 +0200
DumpAsPropertyTree: use more efficient overloads of JsonWriter::put
Change-Id: I6fe3ff8138ed27a04a3a224c67492338cf23992c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138640
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
(cherry picked from commit a909ed32274e202e9f7dc8ac0c1985e258cff1cc)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138538
Tested-by: Jenkins CollaboraOffice
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index ddec46b6c27b..0cdb95af54b1 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -581,7 +581,7 @@ FactoryFunction Button::GetUITestFactory() const
namespace
{
-const char* symbolTypeName(SymbolType eSymbolType)
+std::string_view symbolTypeName(SymbolType eSymbolType)
{
switch (eSymbolType)
{
@@ -3024,9 +3024,9 @@ void RadioButton::DumpAsPropertyTree(tools::JsonWriter&
rJsonWriter)
if(GraphicConverter::Export(aOStm, maImage.GetBitmapEx(),
ConvertDataFormat::PNG) == ERRCODE_NONE)
{
css::uno::Sequence aSeq( static_cast(aOStm.GetData()), aOStm.Tell());
-OUStringBuffer aBuffer("data:image/png;base64,");
+OStringBuffer aBuffer("data:image/png;base64,");
::comphelper::Base64::encode(aBuffer, aSeq);
-rJsonWriter.put("image", aBuffer.makeStringAndClear());
+rJsonWriter.put("image", aBuffer);
}
}
}
diff --git a/vcl/source/control/fixed.cxx b/vcl/source/control/fixed.cxx
index 647a1e96c506..b5afbad983a1 100644
--- a/vcl/source/control/fixed.cxx
+++ b/vcl/source/control/fixed.cxx
@@ -458,7 +458,7 @@ void
SelectableFixedText::DumpAsPropertyTree(tools::JsonWriter& rJsonWriter)
{
Edit::DumpAsPropertyTree(rJsonWriter);
rJsonWriter.put("type", "fixedtext");
-rJsonWriter.put("selectable", "true");
+rJsonWriter.put("selectable", true);
}
void FixedLine::ImplInit( vcl::Window* pParent, WinBits nStyle )
@@ -984,9 +984,9 @@ void FixedImage::DumpAsPropertyTree(tools::JsonWriter&
rJsonWriter)
if(GraphicConverter::Export(aOStm, maImage.GetBitmapEx(),
ConvertDataFormat::PNG) == ERRCODE_NONE)
{
css::uno::Sequence aSeq( static_cast(aOStm.GetData()), aOStm.Tell());
-OUStringBuffer aBuffer("data:image/png;base64,");
+OStringBuffer aBuffer("data:image/png;base64,");
::comphelper::Base64::encode(aBuffer, aSeq);
-rJsonWriter.put("image", aBuffer.makeStringAndClear());
+rJsonWriter.put("image", aBuffer);
}
}
}
diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx
index 8b94d4954b52..9fe8d3c50215 100644
--- a/vcl/source/control/tabctrl.cxx
+++ b/vcl/source/control/tabctrl.cxx
@@ -2194,7 +2194,7 @@ void TabControl::DumpAsPropertyTree(tools::JsonWriter&
rJsonWriter)
pChild->DumpAsPropertyTree(rJsonWriter);
if (!pChild->IsVisible())
-rJsonWriter.put("hidden", "true");
+rJsonWriter.put("hidden", true);
}
}
}
diff --git a/vcl/source/treelist/iconview.cxx b/vcl/source/treelist/iconview.cxx
index b198355a5afb..b134991784b2 100644
--- a/vcl/source/treelist/iconview.cxx
+++ b/vcl/source/treelist/iconview.cxx
@@ -258,7 +258,7 @@ OUString
IconView::GetEntryAccessibleDescription(SvTreeListEntry* pEntry) const
FactoryFunction IconView::GetUITestFactory() const { return
IconViewUIObject::create; }
-static OUString extractPngString(const SvLBoxContextBmp* pBmpItem)
+static OString extractPngString(const SvLBoxContextBmp* pBmpItem)
{
BitmapEx aImage = pBmpItem->GetBitmap1().GetBitmapEx();
SvMemoryStream aOStm(65535, 65535);
@@ -266,7 +266,7 @@ static OUString extractPngString(const SvLBoxContextBmp*
pBmpItem)
{
css::uno::Sequence aSeq(static_cast(aOStm.GetData()),
aOStm.Tell());
-OUStringBuffer aBuffer("data:image/png;base64,");
+OStringBuffer aBuffer("data:image/png;base64,");
::comphelper::Base64::encode(aBuffer, aSeq);
return aBuffer.makeStringAndClear();
}
@@ -298,13 +298,12 @@ static void lcl_DumpEntryAndSiblings(tools::JsonWriter&
rJsonWriter, SvTreeListE
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - vcl/source
vcl/source/treelist/iconview.cxx |3 +++
1 file changed, 3 insertions(+)
New commits:
commit 8097b7e02b0d7d9480e9ff5963e44c2800158e52
Author: Mike Kaganski
AuthorDate: Sat Aug 20 19:17:07 2022 +0300
Commit: Mike Kaganski
CommitDate: Sun Aug 21 14:51:16 2022 +0200
jsdialog: dump IconView separator entries
Change-Id: I1db0a6bf9348db79e9f8c25f5468ebd1398f285a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138593
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
(cherry picked from commit 5b6fd1bcdb417e73307885f92c31464fe326ec9e)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138537
Tested-by: Jenkins CollaboraOffice
diff --git a/vcl/source/treelist/iconview.cxx b/vcl/source/treelist/iconview.cxx
index 570b9e5dbd66..b198355a5afb 100644
--- a/vcl/source/treelist/iconview.cxx
+++ b/vcl/source/treelist/iconview.cxx
@@ -300,6 +300,9 @@ static void lcl_DumpEntryAndSiblings(tools::JsonWriter&
rJsonWriter, SvTreeListE
if (pTabListBox->IsSelected(pEntry))
rJsonWriter.put("selected", "true");
+if (pEntry->GetFlags() & SvTLEntryFlags::IS_SEPARATOR)
+rJsonWriter.put("separator", "true");
+
rJsonWriter.put("row",
OString::number(pTabListBox->GetModel()->GetAbsPos(pEntry)).getStr());
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - vcl/source
vcl/source/treelist/iconview.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit b7c0eb052b5ca08d7bf5ef2b0f0cd619616722cd
Author: Mike Kaganski
AuthorDate: Fri Aug 12 09:38:21 2022 +0300
Commit: Mike Kaganski
CommitDate: Fri Aug 12 19:42:40 2022 +0200
lok: This is tooltip, not alt
Thinko from commit 0b92cf674cd44bdd2c2cdf8a5d597d4407e34002
Change-Id: I66a142441f83f8cd43f2579a85651e3364e74c6f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138170
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
(cherry picked from commit 3458ac7a24052045e51a1f20ad0312054119ad5d)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138126
Tested-by: Jenkins CollaboraOffice
diff --git a/vcl/source/treelist/iconview.cxx b/vcl/source/treelist/iconview.cxx
index a997009a0296..570b9e5dbd66 100644
--- a/vcl/source/treelist/iconview.cxx
+++ b/vcl/source/treelist/iconview.cxx
@@ -295,7 +295,7 @@ static void lcl_DumpEntryAndSiblings(tools::JsonWriter&
rJsonWriter, SvTreeListE
}
if (const OUString tooltip = pTabListBox->GetEntryTooltip(pEntry);
!tooltip.isEmpty())
-rJsonWriter.put("alt", tooltip);
+rJsonWriter.put("tooltip", tooltip);
if (pTabListBox->IsSelected(pEntry))
rJsonWriter.put("selected", "true");
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - vcl/source
vcl/source/gdi/sallayout.cxx | 19 +--
1 file changed, 13 insertions(+), 6 deletions(-)
New commits:
commit 0e8270cb1dc0f4ecf916d14c3d5233c5370bf180
Author: Caolán McNamara
AuthorDate: Tue Jun 28 15:27:57 2022 +0100
Commit: Aron Budea
CommitDate: Sat Aug 6 04:36:49 2022 +0200
tdf#149755 bottom of characters missing in dwrite rendered case
snap bounding box to full pixels
Change-Id: Iecd973e99cec49ee129bad422ae00f558f057abd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136546
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
(cherry picked from commit d8963ecd20579a62906eae3ed14d498bf07cbb98)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137889
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Aron Budea
diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx
index abad66427491..b0669fa0a54f 100644
--- a/vcl/source/gdi/sallayout.cxx
+++ b/vcl/source/gdi/sallayout.cxx
@@ -238,12 +238,19 @@ bool SalLayout::GetBoundRect(tools::Rectangle& rRect)
const
// get bounding rectangle of individual glyph
if (pGlyph->GetGlyphBoundRect(pGlyphFont, aRectangle))
{
-// merge rectangle
-aRectangle += Point(aPos.getX(), aPos.getY());
-if (rRect.IsEmpty())
-rRect = aRectangle;
-else
-rRect.Union(aRectangle);
+if (!aRectangle.IsEmpty())
+{
+aRectangle.AdjustLeft(std::floor(aPos.getX()));
+aRectangle.AdjustRight(std::ceil(aPos.getX()));
+aRectangle.AdjustTop(std::floor(aPos.getY()));
+aRectangle.AdjustBottom(std::ceil(aPos.getY()));
+
+// merge rectangle
+if (rRect.IsEmpty())
+rRect = aRectangle;
+else
+rRect.Union(aRectangle);
+}
bRet = true;
}
}
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - vcl/source
vcl/source/window/layout.cxx |9 +++--
1 file changed, 7 insertions(+), 2 deletions(-)
New commits:
commit 9ca2a827de1b7f3180975ce750674169986c5978
Author: Xisco Fauli
AuthorDate: Thu May 26 16:45:30 2022 +0200
Commit: Aron Budea
CommitDate: Sat Jun 18 03:21:41 2022 +0200
tdf#147844: Use sanity check only if LibreOfficeKit is active
Regression from 2b58a0979f9206cfca6d78cb2f3d5e65cd735f8b
"Add sanity check to avoid potential crash in the Collabora Online
server"
Change-Id: I2fcfb634b47f9d76f8efbbd64a8e69ea236894c3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135024
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
(cherry picked from commit b7efccde76ca7bfa181fff39c52282e87e940614)
Related: tdf#147844 still log the discrepancy
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135367
Tested-by: Jenkins
Reviewed-by: Xisco Fauli
Reviewed-by: Aron Budea
(cherry picked from commit 08850dbead8a8a797965aaa97d43d639bc0814d3)
Change-Id: I2fcfb634b47f9d76f8efbbd64a8e69ea236894c3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136065
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Aron Budea
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index 995ae09a0c9e..c38790b6b2df 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -14,6 +14,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -283,10 +284,14 @@ void VclBox::setAllocation(const Size )
// Though the dialogs are rendered in javascript for LOK Android some widgets
like weld::DrawingArea
// is sent as bitmap but it is rendered from only the visible part
// when it gets negative, it shrinks instead of expands and it becomes
invisible
+
if (nExtraSpace < 0)
{
-SAL_WARN("vcl.layout", "nExtraSpace went negative, setting to
zero");
-nExtraSpace = 0;
+SAL_WARN("vcl.layout", "nExtraSpace went negative for VclBox: " <<
GetHelpId());
+if (comphelper::LibreOfficeKit::isActive())
+{
+nExtraSpace = 0;
+}
}
}
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - vcl/source
vcl/source/treelist/iconviewimpl.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit 0037f2a071c9d8b94e841e6e7201770e08fdd85c
Author: Michael Weghorn
AuthorDate: Fri Jun 10 14:06:42 2022 +0200
Commit: Mike Kaganski
CommitDate: Tue Jun 14 09:30:09 2022 +0200
vcl: Trigger IconView action on space key as well
Handle space key the same as the return key.
This e.g. allows to insert the selected element
into the formula this way in Math again after the
switch to IconView in
commit d79c527c2a599c7821d27cf03b95cb79e2abe685
Date: Wed Jun 1 11:20:12 2022 +0300
Use IconView in SmElementsControl
gtk3 was already behaving that way without this
change in place.
Change-Id: I061b286723fedf023551afbb2184abc946b54b9f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135592
Tested-by: Jenkins
Reviewed-by: Michael Weghorn
(cherry picked from commit 025477e244df2cdb4917e202030c3cab0536550d)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135743
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Mike Kaganski
diff --git a/vcl/source/treelist/iconviewimpl.cxx
b/vcl/source/treelist/iconviewimpl.cxx
index c350eb49c151..f3f2edfda464 100644
--- a/vcl/source/treelist/iconviewimpl.cxx
+++ b/vcl/source/treelist/iconviewimpl.cxx
@@ -710,6 +710,7 @@ bool IconViewImpl::KeyInput( const KeyEvent& rKEvt )
break;
case KEY_RETURN:
+case KEY_SPACE:
{
bHandled = !m_pView->aDoubleClickHdl.Call(m_pView);
break;
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - vcl/source
vcl/source/app/salvtables.cxx |2 +- vcl/source/window/paint.cxx |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 788599c7df58546900874ff0443be8522f9b4a04 Author: Szymon Kłos AuthorDate: Fri Apr 1 13:20:02 2022 +0200 Commit: Szymon Kłos CommitDate: Mon Apr 4 11:22:46 2022 +0200 lok: fix formulabar rendering While forwardporting it was not taken into account that no pixel/logic conversion is needed. regression in: commit cf5b0d5972b02809e9b7f35780885445242b3f12 Author: Szymon Kłos Date: Mon Jan 17 13:11:19 2022 +0100 RTL: lok: render correctly interim windows Change-Id: Ic6716bf9335d4a9297e3e5edfeb161702b846efb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132424 Tested-by: Jenkins CollaboraOffice Reviewed-by: Mert Tumer diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx index 9eb7ff7fe665..9f40b770ffbb 100644 --- a/vcl/source/app/salvtables.cxx +++ b/vcl/source/app/salvtables.cxx @@ -1351,7 +1351,7 @@ void SalInstanceWidget::DoRecursivePaint(vcl::Window* pWindow, const Point& rRen = pChild->GetOutDev()->GetOutOffYPixel() - pWindow->GetOutDev()->GetOutOffYPixel(); Point aPos(rRenderLogicPos); -aPos += rOutput.PixelToLogic(Point(nDeltaX, nDeltaY)); +aPos += Point(nDeltaX, nDeltaY); DoRecursivePaint(pChild, aPos, rOutput); } diff --git a/vcl/source/window/paint.cxx b/vcl/source/window/paint.cxx index 49fd65f8c5fe..40172ade6a9e 100644 --- a/vcl/source/window/paint.cxx +++ b/vcl/source/window/paint.cxx @@ -1421,7 +1421,7 @@ void Window::ImplPaintToDevice( OutputDevice* i_pTargetOutDev, const Point& i_rP if( bHasMirroredGraphics ) nDeltaX = GetOutDev()->mnOutWidth - nDeltaX - pChild->GetOutDev()->mnOutWidth; -tools::Long nDeltaY = pChild->GetOutDev()->mnOutOffY - GetOutDev()->mnOutOffY; +tools::Long nDeltaY = pChild->GetOutOffYPixel() - GetOutOffYPixel(); Point aPos( i_rPos ); aPos += Point(nDeltaX, nDeltaY);
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - vcl/source
vcl/source/window/mouse.cxx |3 +++ 1 file changed, 3 insertions(+) New commits: commit c9ccb88b99eeda1d227ff44587c09241e74d Author: Andras Timar AuthorDate: Fri Mar 25 13:56:53 2022 +0100 Commit: Andras Timar CommitDate: Fri Mar 25 15:21:20 2022 +0100 fix error: unused variable Change-Id: I941e3abd1986bfb490acae3585e165ce42d9c71c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132119 Tested-by: Jenkins CollaboraOffice Reviewed-by: Andras Timar diff --git a/vcl/source/window/mouse.cxx b/vcl/source/window/mouse.cxx index 0c77347f89f8..9b533b991a9e 100644 --- a/vcl/source/window/mouse.cxx +++ b/vcl/source/window/mouse.cxx @@ -769,6 +769,9 @@ Reference< css::datatransfer::dnd::XDragSource > Window::GetDragSource() pDragSourceAL[ 1 ] <<= pEnvData->aShellWindow; pDropTargetAL[ 0 ] <<= Application::GetDisplayConnection(); pDropTargetAL[ 1 ] <<= pEnvData->aShellWindow; +#else // LOKit +(void)pDragSourceAL; +(void)pDropTargetAL; #endif if( !aDragSourceSN.isEmpty() ) mpWindowImpl->mpFrameData->mxDragSource.set(
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - vcl/source
vcl/source/window/toolbox2.cxx |3 ---
1 file changed, 3 deletions(-)
New commits:
commit 16dd3d7e2eeff3a9a64865db69082b50afbf0ea1
Author: Szymon Kłos
AuthorDate: Thu Mar 17 10:15:05 2022 +0100
Commit: Szymon Kłos
CommitDate: Thu Mar 17 10:02:48 2022 +0100
jsdialog: fix toolboxes with children
Don't block JSON generation if toolbox has children...
Fixes missing sidebar items
Change-Id: I34696d780b4292881792b2190a522610a8b4b597
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131696
Tested-by: Szymon Kłos
Reviewed-by: Szymon Kłos
diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx
index f448a3492e2e..5a1112da5c6a 100644
--- a/vcl/source/window/toolbox2.cxx
+++ b/vcl/source/window/toolbox2.cxx
@@ -1736,9 +1736,6 @@ void ToolBox::DumpAsPropertyTree(tools::JsonWriter&
rJsonWriter)
{
DockingWindow::DumpAsPropertyTree(rJsonWriter);
-if (GetChildCount())
-return;
-
auto childrenNode = rJsonWriter.startArray("children");
for (ToolBox::ImplToolItems::size_type i = 0; i < GetItemCount(); ++i)
{
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - vcl/source
vcl/source/window/window.cxx |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit f6064bad1f8077c7300d94fe9646eea2e9506489 Author: Michael Meeks AuthorDate: Fri Mar 11 17:23:43 2022 + Commit: Michael Meeks CommitDate: Wed Mar 16 10:19:29 2022 +0100 Avoid segv when co-editing around SvxColorTabPage. vcl::Window::ImplCallDeactivateListeners(vcl::Window*) vcl/source/window/window.cxx:3403 (discriminator 2) vcl::Window::ImplCallDeactivateListeners(vcl::Window*) vcl/source/window/window.cxx:3404 ... vcl::Window::ImplCallDeactivateListeners(vcl::Window*) vcl/source/window/window.cxx:3404 vcl::Window::ImplAsyncFocusHdl(void*) include/rtl/ref.hxx:112 ... Dialog::Execute() vcl/source/window/dialog.cxx:1056 virtual thunk to SalInstanceDialog::run() vcl/source/app/salvtables.cxx:4924 AbstractSvxNameDialog_Impl::Execute() cui/source/factory/dlgfact.cxx:222 SvxColorTabPage::ClickAddHdl_Impl(weld::Button&) include/rtl/ref.hxx:192 Change-Id: I12a78d65a8e7b8b728dde84f7c51cc19005c9aa6 Signed-off-by: Michael Meeks Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131352 diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index 453bf8e2ca14..180aa4a78dd2 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -3412,7 +3412,8 @@ void Window::ImplCallDeactivateListeners( vcl::Window *pNew ) // #100759#, avoid walking the wrong frame's hierarchy // eg, undocked docking windows (ImplDockFloatWin) -if ( ImplGetParent() && mpWindowImpl->mpFrameWindow == ImplGetParent()->mpWindowImpl->mpFrameWindow ) +if ( ImplGetParent() && ImplGetParent()->mpWindowImpl && + mpWindowImpl->mpFrameWindow == ImplGetParent()->mpWindowImpl->mpFrameWindow ) ImplGetParent()->ImplCallDeactivateListeners( pNew ); } }
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - vcl/source
vcl/source/window/floatwin.cxx |2 +-
vcl/source/window/window.cxx |7 +--
2 files changed, 6 insertions(+), 3 deletions(-)
New commits:
commit 5866932788c5b8c6b9573a3ee1c32ba225357df6
Author: Szymon Kłos
AuthorDate: Thu Mar 3 11:53:49 2022 +0100
Commit: Szymon Kłos
CommitDate: Wed Mar 16 08:52:00 2022 +0100
lok: fix position og autofilter in RTL mode
Change-Id: I73f2b003185c326f4d66c974a2e5aaecb4e0199a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130916
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Mert Tumer
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131124
Tested-by: Szymon Kłos
Reviewed-by: Szymon Kłos
diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx
index 80ab426aa98d..094a3ef184a2 100644
--- a/vcl/source/window/floatwin.cxx
+++ b/vcl/source/window/floatwin.cxx
@@ -509,7 +509,7 @@ tools::Rectangle
FloatingWindow::ImplConvertToAbsPos(vcl::Window* pReference, co
// compare coordinates in absolute screen coordinates
// Keep in sync with FloatingWindow::ImplFloatHitTest, e.g. fdo#33509
-if( pParentWinOutDev->HasMirroredGraphics() )
+if( pParentWinOutDev->HasMirroredGraphics() &&
!comphelper::LibreOfficeKit::isActive() )
{
if(!pReference->IsRTLEnabled() )
pParentWinOutDev->ReMirror(aFloatRect);
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 152d163f3399..453bf8e2ca14 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -2712,11 +2712,14 @@ void Window::setPosSizePixel( tools::Long nX,
tools::Long nY,
{
tools::Rectangle aRect( Point ( nX, nY ), Size( nWidth,
nHeight ) );
const OutputDevice *pParentOutDev = pParent->GetOutDev();
-pParentOutDev->ReMirror( aRect );
+if (!comphelper::LibreOfficeKit::isActive())
+pParentOutDev->ReMirror( aRect );
nX = aRect.Left();
}
}
-if( !(nFlags & PosSizeFlags::X) && bHasValidSize &&
pWindow->mpWindowImpl->mpFrame->maGeometry.nWidth )
+if( !comphelper::LibreOfficeKit::isActive() &&
+!(nFlags & PosSizeFlags::X) && bHasValidSize &&
+pWindow->mpWindowImpl->mpFrame->maGeometry.nWidth )
{
// RTL: make sure the old right aligned position is not changed
// system windows will always grow to the right
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - vcl/source
vcl/source/bitmap/BitmapReadAccess.cxx |5 + 1 file changed, 1 insertion(+), 4 deletions(-) New commits: commit 50ee0a80c43d64ed5f9634a2d4ea6ab1a55a291d Author: Luboš Luňák AuthorDate: Fri Feb 4 14:54:49 2022 +0100 Commit: Andras Timar CommitDate: Mon Feb 21 22:00:27 2022 +0100 Revert "lok: copy over the alpha channel too for cairo..." Not needed anymore (T33230) and no need to slow the function down by checking for LOK. This reverts commit a9c473c3306e28462f9a1898a94277cf0adcbe5e. Change-Id: I585ded78c8617c2560c44ec027d76b363bd26c1c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129490 Tested-by: Jenkins CollaboraOffice Reviewed-by: Michael Meeks diff --git a/vcl/source/bitmap/BitmapReadAccess.cxx b/vcl/source/bitmap/BitmapReadAccess.cxx index 08c148a4d3fe..6e87debd1ec1 100644 --- a/vcl/source/bitmap/BitmapReadAccess.cxx +++ b/vcl/source/bitmap/BitmapReadAccess.cxx @@ -19,7 +19,6 @@ #include #include -#include #include #include @@ -458,8 +457,6 @@ BitmapColor BitmapReadAccess::GetPixelForN32BitTcBgrx(ConstScanline pScanline, t aBitmapColor.SetBlue(*pScanline++); aBitmapColor.SetGreen(*pScanline++); aBitmapColor.SetRed(*pScanline); -if (comphelper::LibreOfficeKit::isActive()) -aBitmapColor.SetAlpha(0xFF - *(++pScanline)); return aBitmapColor; } @@ -483,7 +480,7 @@ void BitmapReadAccess::SetPixelForN32BitTcBgrx(Scanline pScanline, tools::Long n *pScanline++ = rBitmapColor.GetBlue(); *pScanline++ = rBitmapColor.GetGreen(); *pScanline++ = rBitmapColor.GetRed(); -*pScanline = (comphelper::LibreOfficeKit::isActive()) ? 0xFF - rBitmapColor.GetAlpha() : 0xFF; +*pScanline = 0xFF; } BitmapColor BitmapReadAccess::GetPixelForN32BitTcRgba(ConstScanline pScanline, tools::Long nX,
[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - vcl/source
vcl/source/window/layout.cxx |5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 6e1282e134e2ad5c64126744150ea4de5622b132
Author: Tor Lillqvist
AuthorDate: Tue Jan 25 16:57:09 2022 +0200
Commit: Tor Lillqvist
CommitDate: Wed Feb 16 16:40:49 2022 +0200
Add sanity check to avoid potential crash in the Collabora Online server
Make sure some coordinates don't become huge negative numbers. This
doesn't fix the unknown root cause of course.
There already was such a sanity check here in this branch, but for
Android only. I now made it cross-platform.
Let's use the same Change-Id as in the corresponding commit in the
co-2021 branch.
Change-Id: I28e343271b3f80ac203b52db1be58d2add89eecd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128932
Tested-by: Jenkins CollaboraOffice
Reviewed-by: Andras Timar
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index da259ec40c63..995ae09a0c9e 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -283,10 +283,11 @@ void VclBox::setAllocation(const Size )
// Though the dialogs are rendered in javascript for LOK Android some widgets
like weld::DrawingArea
// is sent as bitmap but it is rendered from only the visible part
// when it gets negative, it shrinks instead of expands and it becomes
invisible
-#if HAVE_FEATURE_ANDROID_LOK
if (nExtraSpace < 0)
+{
+SAL_WARN("vcl.layout", "nExtraSpace went negative, setting to
zero");
nExtraSpace = 0;
-#endif
+}
}
//Split into those we pack from the start onwards, and those we pack from
the end backwards
