[Libreoffice-commits] core.git: sfx2/source

[Caolán McNamara (via logerrit)]

 sfx2/source/appl/childwin.cxx   |    4 ++--
 sfx2/source/dialog/basedlgs.cxx |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit a714dfbfb266839633156ef02669ee2c919d1615
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Thu Jan 27 08:52:01 2022 +0000
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Thu Jan 27 10:51:54 2022 +0100

    use WindowStateMask::Size
    
    Change-Id: I6200e9fc20f8eb71bcf509fa739f4234c059f6da
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129024
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/sfx2/source/appl/childwin.cxx b/sfx2/source/appl/childwin.cxx
index ae8e7c35ad71..2eb6bdc0652d 100644
--- a/sfx2/source/appl/childwin.cxx
+++ b/sfx2/source/appl/childwin.cxx
@@ -313,7 +313,7 @@ SfxChildWinInfo SfxChildWindow::GetInfo() const
         aInfo.aSize = pDialog->get_size();
         WindowStateMask nMask = WindowStateMask::Pos | WindowStateMask::State;
         if (pDialog->get_resizable())
-            nMask |= WindowStateMask::Width | WindowStateMask::Height;
+            nMask |= WindowStateMask::Size;
         aInfo.aWinState = pDialog->get_window_state(nMask);
     }
     else if (pWindow)
@@ -324,7 +324,7 @@ SfxChildWinInfo SfxChildWindow::GetInfo() const
         {
             WindowStateMask nMask = WindowStateMask::Pos | 
WindowStateMask::State;
             if ( pWindow->GetStyle() & WB_SIZEABLE )
-                nMask |= WindowStateMask::Width | WindowStateMask::Height;
+                nMask |= WindowStateMask::Size;
             aInfo.aWinState = 
static_cast<SystemWindow*>(pWindow.get())->GetWindowState( nMask );
         }
         else if (DockingWindow* pDockingWindow = 
dynamic_cast<DockingWindow*>(pWindow.get()))
diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx
index 2fefb02ff125..362d2d3c6961 100644
--- a/sfx2/source/dialog/basedlgs.cxx
+++ b/sfx2/source/dialog/basedlgs.cxx
@@ -175,7 +175,7 @@ void SfxModelessDialogController::ChildWinDispose()
     {
         WindowStateMask nMask = WindowStateMask::Pos | WindowStateMask::State;
         if (m_xDialog->get_resizable())
-            nMask |= WindowStateMask::Width | WindowStateMask::Height;
+            nMask |= WindowStateMask::Size;
         m_xImpl->aWinState = m_xDialog->get_window_state(nMask);
         GetBindings().GetWorkWindow_Impl()->ConfigChild_Impl( 
SfxChildIdentifier::DOCKINGWINDOW, SfxDockingConfig::ALIGNDOCKINGWINDOW, 
m_xImpl->pMgr->GetType() );
     }