[Libreoffice-commits] core.git: include/vcl vcl/inc vcl/source vcl/unx

[Jan-Marek Glogowski (via logerrit)]

 include/vcl/windowstate.hxx  |    1 +
 vcl/inc/window.h             |    2 --
 vcl/source/window/syswin.cxx |    8 +++-----
 vcl/unx/gtk3/gtkinst.cxx     |    4 +---
 4 files changed, 5 insertions(+), 10 deletions(-)

New commits:
commit 2e509b886f1d77ef158579385b55f1f94cfbc710
Author:     Jan-Marek Glogowski <glo...@fbihome.de>
AuthorDate: Sun Jun 12 17:42:05 2022 +0200
Commit:     Jan-Marek Glogowski <glo...@fbihome.de>
CommitDate: Fri Jun 17 19:14:05 2022 +0200

    Convert ImplWindowStateFromStr to WindowData(str)
    
    To have a constructor as the counterpart of the toStr() function.
    Better then some unrelated independant function.
    
    Change-Id: Iba4cb3d400a92704753db6b35d12f2189b23077e
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135807
    Tested-by: Jenkins
    Reviewed-by: Jan-Marek Glogowski <glo...@fbihome.de>

diff --git a/include/vcl/windowstate.hxx b/include/vcl/windowstate.hxx
index b78162ddf52e..772d5c397f76 100644
--- a/include/vcl/windowstate.hxx
+++ b/include/vcl/windowstate.hxx
@@ -80,6 +80,7 @@ public:
         , mnMaximizedHeight(0)
     {
     }
+    WindowData(std::string_view rStr);
 
     // serialize values to a string (the original WindowState representation)
     OString toStr() const;
diff --git a/vcl/inc/window.h b/vcl/inc/window.h
index 18e1a3e1e417..3021e8bc7b6b 100644
--- a/vcl/inc/window.h
+++ b/vcl/inc/window.h
@@ -433,8 +433,6 @@ bool ImplLOKHandleMouseEvent( const VclPtr<vcl::Window>& 
xWindow, MouseNotifyEve
 
 void ImplHandleResize( vcl::Window* pWindow, tools::Long nNewWidth, 
tools::Long nNewHeight );
 
-VCL_DLLPUBLIC void ImplWindowStateFromStr(vcl::WindowData& rData, 
std::string_view rStr);
-
 VCL_DLLPUBLIC css::uno::Reference<css::accessibility::XAccessibleEditableText>
 
FindFocusedEditableText(css::uno::Reference<css::accessibility::XAccessibleContext>
 const&);
 
diff --git a/vcl/source/window/syswin.cxx b/vcl/source/window/syswin.cxx
index 113b2da02689..5a5baf380e71 100644
--- a/vcl/source/window/syswin.cxx
+++ b/vcl/source/window/syswin.cxx
@@ -399,8 +399,9 @@ const Size& SystemWindow::GetMaxOutputSizePixel() const
     return mpImplData->maMaxOutSize;
 }
 
-void ImplWindowStateFromStr(vcl::WindowData& rData, std::string_view rStr)
+vcl::WindowData::WindowData(std::string_view rStr)
 {
+    vcl::WindowData& rData = *this;
     vcl::WindowDataMask nValidMask = vcl::WindowDataMask::NONE;
     sal_Int32 nIndex      = 0;
 
@@ -826,10 +827,7 @@ void SystemWindow::SetWindowState(std::string_view rStr)
 {
     if (rStr.empty())
         return;
-
-    vcl::WindowData aData;
-    ImplWindowStateFromStr( aData, rStr );
-    SetWindowState( aData );
+    SetWindowState(vcl::WindowData(rStr));
 }
 
 OString SystemWindow::GetWindowState(vcl::WindowDataMask nMask) const
diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index a49e32dc8cfa..6959f80698b0 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -6334,9 +6334,7 @@ public:
 
     virtual void set_window_state(const OString& rStr) override
     {
-        vcl::WindowData aData;
-        ImplWindowStateFromStr( aData, rStr );
-
+        const vcl::WindowData aData(rStr);
         const auto nMask = aData.mask();
         const auto nState = aData.state() & vcl::WindowState::SystemMask;