configure.ac | 4 ++--
vcl/source/window/window.cxx | 4 ----
vcl/win/gdi/salvd.cxx | 1 -
vcl/win/window/salframe.cxx | 10 ----------
4 files changed, 2 insertions(+), 17 deletions(-)
New commits:
commit 32eec07a9e6343f87c7767b0087648fd6a8c4b58
Author: Samuel Mehrbrodt <samuel.mehrbr...@allotropia.de>
AuthorDate: Thu Jun 16 11:06:06 2022 +0200
Commit: Samuel Mehrbrodt <samuel.mehrbr...@allotropia.de>
CommitDate: Thu Jun 16 11:06:06 2022 +0200
Revert "vcl: add some WinSalGraphics debug logging"
This reverts commit 89612b363f3f11248beea6fa98071c80e8ea7a9c.
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index cbd93e3e44bf..9a5a6cde533b 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -86,7 +86,6 @@ Window::Window( WindowType nType )
: OutputDevice(OUTDEV_WINDOW)
, mpWindowImpl(new WindowImpl( nType ))
{
- SAL_INFO("vcl.temp", "Window::Window: " << this);
// true: this outdev will be mirrored if RTL window layout (UI mirroring)
is globally active
mbEnableRTL = AllSettings::GetLayoutRTL();
}
@@ -95,7 +94,6 @@ Window::Window( vcl::Window* pParent, WinBits nStyle )
: OutputDevice(OUTDEV_WINDOW)
, mpWindowImpl(new WindowImpl( WindowType::WINDOW ))
{
- SAL_INFO("vcl.temp", "Window::Window: " << this);
// true: this outdev will be mirrored if RTL window layout (UI mirroring)
is globally active
mbEnableRTL = AllSettings::GetLayoutRTL();
@@ -142,7 +140,6 @@ bool Window::IsDisposed() const
void Window::dispose()
{
- SAL_INFO("vcl.temp", "Window::dispose: " << this << " mpFrame " <<
(mpWindowImpl ? mpWindowImpl->mpFrame : nullptr));
assert( mpWindowImpl );
assert( !mpWindowImpl->mbInDispose ); // should only be called from
disposeOnce()
assert( (!mpWindowImpl->mpParent ||
@@ -1040,7 +1037,6 @@ void Window::ImplInit( vcl::Window* pParent, WinBits
nStyle, SystemParentData* p
pFrame = pSVData->mpDefInst->CreateChildFrame( pSystemParentData,
nFrameStyle | SalFrameStyleFlags::PLUG );
else
pFrame = pSVData->mpDefInst->CreateFrame( pParentFrame,
nFrameStyle );
- SAL_INFO("vcl.temp", "Window::ImplInit: " << this << " pFrame " <<
pFrame);
if ( !pFrame )
{
// do not abort but throw an exception, may be the current thread
terminates anyway (plugin-scenario)
diff --git a/vcl/win/gdi/salvd.cxx b/vcl/win/gdi/salvd.cxx
index b506fd4ea5cc..d06412bc6743 100644
--- a/vcl/win/gdi/salvd.cxx
+++ b/vcl/win/gdi/salvd.cxx
@@ -124,7 +124,6 @@ std::unique_ptr<SalVirtualDevice>
WinSalInstance::CreateVirtualDevice( SalGraphi
WinSalGraphics* pVirGraphics = new
WinSalGraphics(WinSalGraphics::VIRTUAL_DEVICE,
pGraphics->isScreen(),
nullptr, pVDev);
- SAL_INFO("vcl.temp", "new WinSalGraphics: " << pVirGraphics << " for " <<
pVDev);
// by default no! mirroring for VirtualDevices, can be enabled with
EnableRTL()
pVirGraphics->SetLayout( SalLayoutFlags::NONE );
diff --git a/vcl/win/window/salframe.cxx b/vcl/win/window/salframe.cxx
index aed15def4240..dd5f8fbb8533 100644
--- a/vcl/win/window/salframe.cxx
+++ b/vcl/win/window/salframe.cxx
@@ -828,7 +828,6 @@ void SetForegroundWindow_Impl(HWND hwnd)
WinSalFrame::WinSalFrame()
{
- SAL_INFO("vcl.temp", "new WinSalFrame: " << this);
SalData* pSalData = GetSalData();
mhWnd = nullptr;
@@ -930,7 +929,6 @@ bool WinSalFrame::ReleaseFrameGraphicsDC( WinSalGraphics*
pGraphics )
WinSalFrame::~WinSalFrame()
{
- SAL_INFO("vcl.temp", "del WinSalFrame: " << this);
SalData* pSalData = GetSalData();
if( mpClipRgnData )
@@ -947,7 +945,6 @@ WinSalFrame::~WinSalFrame()
if ( mpThreadGraphics )
{
ReleaseFrameGraphicsDC( mpThreadGraphics );
- SAL_INFO("vcl.temp", "del WinSalGraphics: " << mpThreadGraphics << "
on " << this);
delete mpThreadGraphics;
mpThreadGraphics = nullptr;
}
@@ -956,7 +953,6 @@ WinSalFrame::~WinSalFrame()
if ( mpLocalGraphics )
{
ReleaseFrameGraphicsDC( mpLocalGraphics );
- SAL_INFO("vcl.temp", "del WinSalGraphics: " << mpLocalGraphics << " on
" << this);
delete mpLocalGraphics;
mpLocalGraphics = nullptr;
}
@@ -1032,10 +1028,7 @@ SalGraphics* WinSalFrame::AcquireGraphics()
return nullptr;
if ( !mpThreadGraphics )
- {
mpThreadGraphics = new WinSalGraphics(WinSalGraphics::WINDOW,
true, mhWnd, this);
- SAL_INFO("vcl.temp", "new WinSalGraphics: " << mpThreadGraphics <<
" on " << this);
- }
pGraphics = mpThreadGraphics;
assert( !pGraphics->getHDC() );
hDC = reinterpret_cast<HDC>(static_cast<sal_IntPtr>(SendMessageW(
pSalData->mpInstance->mhComWnd,
@@ -1044,10 +1037,7 @@ SalGraphics* WinSalFrame::AcquireGraphics()
else
{
if ( !mpLocalGraphics )
- {
mpLocalGraphics = new WinSalGraphics(WinSalGraphics::WINDOW, true,
mhWnd, this);
- SAL_INFO("vcl.temp", "new WinSalGraphics: " << mpLocalGraphics <<
" on " << this);
- }
pGraphics = mpLocalGraphics;
hDC = pGraphics->getHDC();
if ( !hDC )
commit 6282073f5d35542fe901d5b3304a66f46aff1cee
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Wed Feb 16 13:38:47 2022 +0100
Commit: Samuel Mehrbrodt <samuel.mehrbr...@allotropia.de>
CommitDate: Wed Jun 15 20:42:37 2022 +0200
configure.ac: Update kf5 include/lib check to work with KF5 >= 5.91
The 'kcoreaddons_version.h' header was moved to the 'KCoreAddons'
subdirectory in kcoreaddons commit
commit d971ba9bb27a3e8f18a116692fdf98c1729ac244
Author: Ahmad Samir <a.samir...@gmail.com>
Date: Sat Jan 15 14:14:13 2022 +0200
Install kcoreaddons_version.h in /usr/include/KF5/KCoreAddons/
Instead of /usr/include/KF5/kcoreaddons_version.h.
For more details see:
https://invent.kde.org/frameworks/kservice/-/merge_requests/79
GIT_SILENT
Adapt the KF5 check to check for the 'KFileWidget' header and
the 'libKF5KIOFileWidgets.so' library instead.
This is more exact anyway, since we require KIOFileWidgets,
and the previous check didn't ensure that.
(So in case only KF5CoreAddons but not KIOFileWidgets was installed,
configure would previously pass, but the build fail.)
[1]
https://invent.kde.org/frameworks/kcoreaddons/-/commit/d971ba9bb27a3e8f18a116692fdf98c1729ac244
Change-Id: I7ecf7f29dce85e1a6e6b0d4f2519fa37ab04ca84
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129996
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/configure.ac b/configure.ac
index af3e00774bdd..dbf980544554 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11396,8 +11396,8 @@ then
kf5_libdirs="$kf5_libdirs /usr/lib64 /usr/lib64/kf5
/usr/lib64/kf5/devel"
fi
- kf5_test_include="KF5/kcoreaddons_version.h"
- kf5_test_library="libKF5CoreAddons.so"
+ kf5_test_include="KF5/KIOFileWidgets/KFileWidget"
+ kf5_test_library="libKF5KIOFileWidgets.so"
kf5_libdirs="$qt5_libdir $kf5_libdirs"
dnl kf5 KDE4 support compatibility installed
