diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-10-30 09:13:17 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-10-30 17:01:41 +0100 |
| commit | 24199261767ce86674d675b7e5fa7ce3a615f442 (patch) | |
| tree | 78c86dbca694f1147263d323d632272a46bc2d26 /vcl | |
| parent | d465d5b1cc962f56534d685fe8af5f26083fb7ba (diff) | |
split WindowStateData into its own header
Change-Id: I2ad8f4edd1d8e0f4a4f9a1eec546f98d94a48198
Reviewed-on: https://gerrit.libreoffice.org/81743
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/window/syswin.cxx | 24 | ||||
| -rw-r--r-- | vcl/unx/gtk3/gtk3gtkinst.cxx | 2 |
2 files changed, 13 insertions, 13 deletions
diff --git a/vcl/source/window/syswin.cxx b/vcl/source/window/syswin.cxx index 5d87ad141c7b..ce463c6b5551 100644 --- a/vcl/source/window/syswin.cxx +++ b/vcl/source/window/syswin.cxx @@ -542,45 +542,45 @@ void ImplWindowStateFromStr(WindowStateData& rData, rData.SetMask( nValidMask ); } -OString ImplWindowStateToStr(const WindowStateData& rData) +OString WindowStateData::ToStr() const { - const WindowStateMask nValidMask = rData.GetMask(); + const WindowStateMask nValidMask = GetMask(); if ( nValidMask == WindowStateMask::NONE ) return OString(); OStringBuffer rStrBuf(64); if ( nValidMask & WindowStateMask::X ) - rStrBuf.append(static_cast<sal_Int32>(rData.GetX())); + rStrBuf.append(static_cast<sal_Int32>(GetX())); rStrBuf.append(','); if ( nValidMask & WindowStateMask::Y ) - rStrBuf.append(static_cast<sal_Int32>(rData.GetY())); + rStrBuf.append(static_cast<sal_Int32>(GetY())); rStrBuf.append(','); if ( nValidMask & WindowStateMask::Width ) - rStrBuf.append(static_cast<sal_Int32>(rData.GetWidth())); + rStrBuf.append(static_cast<sal_Int32>(GetWidth())); rStrBuf.append(','); if ( nValidMask & WindowStateMask::Height ) - rStrBuf.append(static_cast<sal_Int32>(rData.GetHeight())); + rStrBuf.append(static_cast<sal_Int32>(GetHeight())); rStrBuf.append( ';' ); if ( nValidMask & WindowStateMask::State ) { // #94144# allow Minimize again, should be masked out when read from configuration // 91625 - ignore Minimize - WindowStateState nState = rData.GetState(); + WindowStateState nState = GetState(); rStrBuf.append(static_cast<sal_Int32>(nState)); } rStrBuf.append(';'); if ( nValidMask & WindowStateMask::MaximizedX ) - rStrBuf.append(static_cast<sal_Int32>(rData.GetMaximizedX())); + rStrBuf.append(static_cast<sal_Int32>(GetMaximizedX())); rStrBuf.append(','); if ( nValidMask & WindowStateMask::MaximizedY ) - rStrBuf.append(static_cast<sal_Int32>(rData.GetMaximizedY())); + rStrBuf.append(static_cast<sal_Int32>(GetMaximizedY())); rStrBuf.append( ',' ); if ( nValidMask & WindowStateMask::MaximizedWidth ) - rStrBuf.append(static_cast<sal_Int32>(rData.GetMaximizedWidth())); + rStrBuf.append(static_cast<sal_Int32>(GetMaximizedWidth())); rStrBuf.append(','); if ( nValidMask & WindowStateMask::MaximizedHeight ) - rStrBuf.append(static_cast<sal_Int32>(rData.GetMaximizedHeight())); + rStrBuf.append(static_cast<sal_Int32>(GetMaximizedHeight())); rStrBuf.append(';'); return rStrBuf.makeStringAndClear(); @@ -895,7 +895,7 @@ OString SystemWindow::GetWindowState( WindowStateMask nMask ) const aData.SetMask( nMask ); GetWindowStateData( aData ); - return ImplWindowStateToStr(aData); + return aData.ToStr(); } void SystemWindow::SetMenuBar(MenuBar* pMenuBar) diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx index 58d6f86a0f83..6c318ce0bb91 100644 --- a/vcl/unx/gtk3/gtk3gtkinst.cxx +++ b/vcl/unx/gtk3/gtk3gtkinst.cxx @@ -3611,7 +3611,7 @@ public: aData.SetHeight(aSize.Height()); } - return ImplWindowStateToStr(aData); + return aData.ToStr(); } virtual void connect_toplevel_focus_changed(const Link<weld::Widget&, void>& rLink) override |