ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

vcl: Consolidate SystemWindow::GetWindowState callers

Browse Source 
Switch/Simplify the 2 remaining callers of the variant with the
vcl::WindowData in/out param to use the one that takes the mask
and returns the vcl::WindowData.

Make the other variant private as it's by now only used
inside of the SystemWindow class itself.

Change-Id: Iea0a2d64a552ff27ff5f8595f6d4379b6b224f94
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/208171
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
This commit is contained in:
Michael Weghorn
2026-07-19 19:30:44 +02:00
parent 4e81fbaa3f
commit 3471de2f73
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/vcl/syswin.hxx
+2 -1
View File
@@ -154,6 +154,8 @@ private:
// during actions
SAL_DLLPRIVATE void ensureRepaint();
SAL_DLLPRIVATE void GetWindowState(vcl::WindowData& rData) const;
protected:
// Single argument ctors shall be explicit.
SAL_DLLPRIVATE explicit SystemWindow(
@@ -216,7 +218,6 @@ public:
VclPtr<NotebookBar> const & GetNotebookBar() const;
TaskPaneList* GetTaskPaneList();
SAL_DLLPRIVATE void GetWindowState(vcl::WindowData& rData) const;
virtual void SetText( const OUString& rStr ) override;
virtual OUString GetText() const override;
vcl/source/window/dockwin.cxx
+2 -6
View File
@@ -922,9 +922,7 @@ Point DockingWindow::GetFloatingPos() const
{
if ( pWrapper->mpFloatWin )
{
vcl::WindowData aData;
aData.setMask(vcl::WindowDataMask::Pos);
pWrapper->mpFloatWin->GetWindowState( aData );
const vcl::WindowData aData = pWrapper->mpFloatWin->GetWindowState(vcl::WindowDataMask::Pos);
AbsoluteScreenPixelPoint aPos(aData.x(), aData.y());
// LOK needs logic coordinates not absolute screen position for autofilter menu
if (!comphelper::LibreOfficeKit::isActive())
@@ -937,9 +935,7 @@ Point DockingWindow::GetFloatingPos() const
if ( mpFloatWin )
{
vcl::WindowData aData;
aData.setMask(vcl::WindowDataMask::Pos);
mpFloatWin->GetWindowState( aData );
const vcl::WindowData aData = mpFloatWin->GetWindowState(vcl::WindowDataMask::Pos);
AbsoluteScreenPixelPoint aPos(aData.x(), aData.y());
return mpFloatWin->GetParent()->ImplGetFrameWindow()->AbsoluteScreenToOutputPixel( aPos );
}